From f64c7d9ffa9b12879353cace1a8765ba5d82009f Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Sun, 3 Sep 2023 20:36:13 -0700
Subject: [PATCH] filter ALL modules for i686 devel

---
 scripts/updates-8-devel-lookahead.sh       | 8 +++++---
 scripts/updates-8-devel.sh                 | 9 ++++++---
 shared/additional_and_filter_packages.conf | 8 ++------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/scripts/updates-8-devel-lookahead.sh b/scripts/updates-8-devel-lookahead.sh
index 1cce6b3..6cc9d58 100755
--- a/scripts/updates-8-devel-lookahead.sh
+++ b/scripts/updates-8-devel-lookahead.sh
@@ -32,9 +32,11 @@ if [[ "$ret_val" != "0" ]]; then
   exit 1
 fi
 
-if [ $? -eq 0 ]; then
+if [ "$ret_val" -eq 0 ]; then
   pushd "${TARGET_DIR}/latest-Rocky-$SHORT-8/compose/$SHORT" || { echo "Could not switch."; exit 1; }
-  echo "Moving i386 to i686"
-  mv i386 i686
+  if [ -d "i386" ]; then
+    echo "Moving i386 to i686"
+    mv i386 i686
+  fi
   popd || { echo "Could not switch."; exit 1; }
 fi
diff --git a/scripts/updates-8-devel.sh b/scripts/updates-8-devel.sh
index 152753d..f3c21f0 100755
--- a/scripts/updates-8-devel.sh
+++ b/scripts/updates-8-devel.sh
@@ -20,10 +20,13 @@ else
 fi
 
 time $CMD
+ret_val=$?
 
-if [ $? -eq 0 ]; then
+if [ "$ret_val" -eq 0 ]; then
   pushd "${TARGET_DIR}/latest-Rocky-$SHORT-8/compose/$SHORT" || { echo "Could not switch."; exit 1; }
-  echo "Moving i386 to i686"
-  mv i386 i686
+  if [ -d "i386" ]; then
+    echo "Moving i386 to i686"
+    mv i386 i686
+  fi
   popd || { echo "Could not switch."; exit 1; }
 fi
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 3cea797..550efe4 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -54,12 +54,8 @@ filter_modules = [
              "eclipse:rhel8",
              ]
            }),
-    ("^devel$", {
-       "i686":
-             [
-             "virt:rhel",
-             ]
-           }),
+    # newer pungi is overly strict on module data
+    ("^devel$", { "i686": ["*"] }),
 ]
 
 additional_packages = [