From f462ab7c049240bc1379b9db16e77acd99fa2de2 Mon Sep 17 00:00:00 2001 From: "Jason N." <33561705+JasonN3@users.noreply.github.com> Date: Thu, 7 Mar 2024 17:27:57 -0500 Subject: [PATCH] findme --- lorax_templates/download_flatpaks.tmpl.in | 3 +++ tests/iso/verify_flatpakrepo_updated.sh | 16 +++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/lorax_templates/download_flatpaks.tmpl.in b/lorax_templates/download_flatpaks.tmpl.in index a5a6a37..a7cca97 100644 --- a/lorax_templates/download_flatpaks.tmpl.in +++ b/lorax_templates/download_flatpaks.tmpl.in @@ -38,6 +38,9 @@ runcmd flatpak remote-add --user ${flatpak_remote_name} ${flatpak_remote_url} runcmd mkdir -p ${root}/flatpak runcmd ostree init --repo=${dest_repo} --mode=archive-z2 <% +f = open("/findme.txt", "a") +f.write("I'm here!") +f.close() cmd_result = subprocess.run(['ostree', 'refs', '--repo=/flatpak/repo'], stdout=subprocess.PIPE) all_refs = cmd_result.stdout.decode('utf-8').strip().split('\n') found_refs = [entry[7:] for entry in all_refs if entry.startswith('deploy/')] diff --git a/tests/iso/verify_flatpakrepo_updated.sh b/tests/iso/verify_flatpakrepo_updated.sh index acd81a8..b5ee240 100644 --- a/tests/iso/verify_flatpakrepo_updated.sh +++ b/tests/iso/verify_flatpakrepo_updated.sh @@ -1,9 +1,5 @@ #!/bin/bash -export - -set -ex - add_line=$(grep flatpak_manager.add_remote /mnt/install/usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py) add_line_repo=$(echo ${add_line} | grep ${FLATPAK_REMOTE_NAME}) @@ -12,14 +8,18 @@ add_line_url=$(echo ${add_line} | grep ${_FLATPAK_REPO_URL}) result=0 if [ -z "${add_line_repo}" ] then - echo "Repo name not updated" + echo "Repo name not updated on add_remote line" result=1 +else + echo "Repo name found on add_remote line" fi if [ -z "${add_line_url}" ] then - echo "Repo url not updated" + echo "Repo url not updated on add_remote line" result=1 +else + echo "Repo url found on add_remote line" fi replace_line=$(grep flatpak_manager.replace_installed_refs_remote /mnt/install/usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py) @@ -28,8 +28,10 @@ replace_line_repo=$(echo ${replace_line} | grep ${FLATPAK_REMOTE_NAME}) if [ -z "${replace_line_repo}" ] then - echo "Repo name not updated in second line" + echo "Repo name not updated on replace_installed_refs line" result=1 +else + echo "Repo name found on replace_installed_refs line" fi exit ${result} \ No newline at end of file