From fbc67fb22e1388f409fd5336719075db7392a1ad Mon Sep 17 00:00:00 2001
From: Michal Suchanek <msuchanek@suse.de>
Date: May 04 2023 21:32:47 +0000
Subject: Merge branch 'scripts' into packaging


---

diff --git a/scripts/git_sort/tests/run_all.sh b/scripts/git_sort/tests/run_all.sh
index e0109b1..a4eb58c 100755
--- a/scripts/git_sort/tests/run_all.sh
+++ b/scripts/git_sort/tests/run_all.sh
@@ -34,11 +34,11 @@ for release in \
 	echo "Building container image for $release..."
 	docker build "$@" -t gs-test-$release -f $testdir/Docker/$release.Dockerfile --build-arg release=$release $testdir/Docker
 	ret=$?
-	[ $ret -eq 0 ] || exit $?
+	[ $ret -eq 0 ] || exit $ret
 	echo "Running tests in $release:"
 	docker run --rm --name=gs-test-$release \
 		--mount type=bind,source="$testdir/../../",target=/scripts,readonly \
 		gs-test-$release
 	ret=$?
-	[ $ret -eq 0 ] || exit $?
+	[ $ret -eq 0 ] || exit $ret
 done
diff --git a/scripts/lib/SUSE/MyBS.pm b/scripts/lib/SUSE/MyBS.pm
index 1b4e5ca..9d3d73f 100644
--- a/scripts/lib/SUSE/MyBS.pm
+++ b/scripts/lib/SUSE/MyBS.pm
@@ -489,7 +489,10 @@ sub get_repo_archs {
 			$self->{has_match} = 0;
 		}
 		if ($element eq "arch" && $self->{has_match}) {
-			push(@{$self->{res}{$self->{repo_name}}}, $self->{cur_string});
+			# i586 in openSUSE:Factory is excluded from builds
+			if ($project ne 'openSUSE:Factory' || $self->{cur_string} ne 'i586') {
+				push(@{$self->{res}{$self->{repo_name}}}, $self->{cur_string});
+			}
 			$self->{cur_string} = "";
 		}
 	};