Commit ad3c8bc7 authored by Holger Levsen's avatar Holger Levsen
Browse files

fixup fa0996b4: reproducible Archlinux: exclusivly use the db to track blacklisted packages 



Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent fa0996b4

bin/reproducible_archlinux_scheduler.sh

+5 −1
Original line number Diff line number Diff line
@@ -115,7 +115,11 @@ update_archlinux_repositories() { 
					if [ "$VERCMP" = "1" ] ; then

						# known package with new version, so update db and schedule

						query_db "UPDATE sources SET version = '$version' WHERE name = '$PKG' AND suite = '$SUITE' AND architecture='$ARCH';"

						PKG_STATUS=$(query_db "SELECT status FROM results WHERE package_id='$PKG_ID';")

						PKG_STATUS=$(query_db "SELECT r.status FROM results AS r

							JOIN sources as s on s.id=r.package_id

							WHERE s.architecture='x86_64'

							AND s.name='$PKG'

							AND s.suite='$SUITE';")

						if [ "$PKG_STATUS" = "BLACKLISTED" ] ; then

							echo "$PKG is blacklisted, so not scheduling it."

							continue

bin/reproducible_common.sh

+2 −2
Original line number Diff line number Diff line
@@ -1083,11 +1083,11 @@ create_pkg_html() { 
			STATE=FTBFS_4

			buffer_message='failed to build, pkg relations contain invalid characters'

		else

			STATE=query_db "SELECT r.status FROM results AS r

			STATE=$(query_db "SELECT r.status FROM results AS r

				JOIN sources as s on s.id=r.package_id

				WHERE s.architecture='x86_64'

				AND s.name='$SRCPACKAGE'

				AND s.suite='archlinux_$REPOSITORY';"

				AND s.suite='archlinux_$REPOSITORY';")

			if [ "$STATE" = "BLACKLISTED" ] ; then

				buffer_message='blacklisted'

			else