From 697238fbdc7147c83766c9d5526ef933ba557568 Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 29 Oct 2024 12:25:41 -0400
Subject: [PATCH] cleanup

---
 .github/workflows/build_vars.yml      | 20 ++++++++++----------
 lorax_templates/flatpak_set_repo.tmpl |  1 -
 test/iso/flatpak_repo_updated.sh      |  5 +++++
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml
index 3822555..ec5749d 100644
--- a/.github/workflows/build_vars.yml
+++ b/.github/workflows/build_vars.yml
@@ -18,16 +18,16 @@ on:
               "flatpak_dir",
               "flatpak_refs"
             ],
-            "exclude": [
-              {
-                "version": "40",
-                "flatpaks": "flatpak_dir"
-              },
-              {
-                "version": "40",
-                "flatpaks": "flatpak_refs"
-              }
-            ],
+            #"exclude": [
+            #  {
+            #    "version": "40",
+            #    "flatpaks": "flatpak_dir"
+            #  },
+            #  {
+            #    "version": "40",
+            #    "flatpaks": "flatpak_refs"
+            #  }
+            #],
             "include": [
               {
                 "version": "39",
diff --git a/lorax_templates/flatpak_set_repo.tmpl b/lorax_templates/flatpak_set_repo.tmpl
index 0015349..b7fae2d 100644
--- a/lorax_templates/flatpak_set_repo.tmpl
+++ b/lorax_templates/flatpak_set_repo.tmpl
@@ -2,7 +2,6 @@
 % if int(version) >= 41:
 append etc/anaconda/conf.d/anaconda.conf "[Payload]"
 append etc/anaconda/conf.d/anaconda.conf "flatpak_remote = ${flatpak_remote_name} ${_flatpak_repo_url}"
-#replace "fedora  oci+https://registry.fedoraproject.org" "${flatpak_remote_name} ${_flatpak_repo_url}" etc/anaconda/anaconda.conf
 % else:
 replace "flatpak_manager\.add_remote\(\".*\", \".*\"\)" "flatpak_manager.add_remote(\"${flatpak_remote_name}\", \"${_flatpak_repo_url}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
 replace "flatpak_manager\.replace_installed_refs_remote\(\".*\"\)" "flatpak_manager.replace_installed_refs_remote(\"${flatpak_remote_name}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
diff --git a/test/iso/flatpak_repo_updated.sh b/test/iso/flatpak_repo_updated.sh
index 83f3773..8d9ad1f 100644
--- a/test/iso/flatpak_repo_updated.sh
+++ b/test/iso/flatpak_repo_updated.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+if [[ ${VERSION} >= 41 ]]
+then
+    exit 0
+fi
+
 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}")