filter ALL modules for i686 devel

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

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

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 = [