Fix move for testing config and check testing first

QubesOS · Nov 14, 2020 · cef0e61 · cef0e61
1 parent 1efa4a6
commit cef0e61
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/update-sources b/update-sources
@@ -63,15 +63,15 @@ if [ "$BRANCH" == "master" ]; then
     RAWHIDE_KERNEL="$(dnf -q repoquery kernel --disablerepo=* --enablerepo=fedora --enablerepo=updates --releasever=rawhide | grep -v "rc[0-9]*" | sort -V | tail -1 | cut -d ':' -f2 | cut -d '-' -f1 || true)"
 fi
 
-if distance_version "$STABLE_KERNEL" "$LATEST_KERNEL_VERSION"; then
-    "$LOCALDIR/get-fedora-latest-config" --releasever "$FC_LATEST"
-    mv config-base-"$STABLE_KERNEL" config-base
-elif [ "$BRANCH" == "master" ] && { distance_version "$TESTING_KERNEL" "$LATEST_KERNEL_VERSION"; }; then
+if [ "$BRANCH" == "master" ] && { distance_version "$TESTING_KERNEL" "$LATEST_KERNEL_VERSION"; }; then
     "$LOCALDIR/get-fedora-latest-config" --releasever "$FC_LATEST" --include-testing
-    mv config-base-"$STABLE_KERNEL" config-base
+    mv config-base-"$TESTING_KERNEL" config-base
 elif [ "$BRANCH" == "master" ] && { distance_version "$RAWHIDE_KERNEL" "$LATEST_KERNEL_VERSION"; }; then
     "$LOCALDIR/get-fedora-latest-config" --releasever rawhide
     mv config-base-"$RAWHIDE_KERNEL" config-base
+elif distance_version "$STABLE_KERNEL" "$LATEST_KERNEL_VERSION"; then
+    "$LOCALDIR/get-fedora-latest-config" --releasever "$FC_LATEST"
+    mv config-base-"$STABLE_KERNEL" config-base
 else
     echo "Cannot determine latest config for kernel ${LATEST_KERNEL_VERSION}. Use the current existing config..."
 fi