[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: correctly deal with the Debian Edu packages not being installable

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
c6503196 by Holger Levsen at 2022-08-24T11:43:36+02:00
reproducible Debian: correctly deal with the Debian Edu packages not being installable

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/reproducible_create_meta_pkg_sets.sh


Changes:

=====================================
bin/reproducible_create_meta_pkg_sets.sh
=====================================
@@ -333,11 +333,13 @@ update_pkg_set_specific() {
 			# required and maintained by Debian Edu
 			chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME \( -FPriority required --or -FMaintainer debian-edu at lists.debian.org \) > ${TMPFILE2}
 			get_installable_set
-			mv $TMPFILE ${TMPFILE2}
-			cat ${TMPFILE2} ${TMPFILE3} > $TMPFILE
 			if [ -f $TMPFILE ] ; then
-				convert_from_deb822_into_source_packages_only
+				mv $TMPFILE ${TMPFILE2}
+				cat ${TMPFILE2} ${TMPFILE3} > $TMPFILE
+			else
+				mv ${TMPFILE3} $TMPFILE
 			fi
+			convert_from_deb822_into_source_packages_only
 			;;
 		freedombox)
 			# freedombox and plinth and everything they depend on



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/c6503196ae8731662f41234e57132e643602a1d8

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/c6503196ae8731662f41234e57132e643602a1d8
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20220824/84febdd1/attachment-0001.htm>