[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian rebuilder 'thing': cleanup

[Holger Levsen]

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


Commits:
ddfab7ec by Holger Levsen at 2020-05-02T13:53:26+02:00
reproducible Debian rebuilder 'thing': cleanup

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

- - - - -


1 changed file:

- bin/reproducible_debian_rebuilder_prototype.sh


Changes:

=====================================
bin/reproducible_debian_rebuilder_prototype.sh
=====================================
@@ -63,9 +63,9 @@ SOURCES=$(ls $CHPATH/$DISTNAME/var/lib/apt/lists/*_dists_${SUITE}_main_source_So
 BINARY_PKG=$(grep-available . -s Package $PACKAGES | sort -R | head -1 | cut -d ' ' -f2)
 PKG=$( ( grep-available -X -S $BINARY_PKG -s Package $SOURCES || grep-available -X -P $BINARY_PKG -s Source $PACKAGES ) | cut -d ' ' -f2)
 VERSION=$(grep-available -X -S $PKG -s Version $SOURCES | head -1 | cut -d ' ' -f2)
-output_echo "let's try to rebuild $PKG ($VERSION) from $SUITE/$ARCH"
+output_echo "let's try to rebuild $BINARY_PKG from src:$PKG ($VERSION) from $SUITE/$ARCH"
 
-# query a random .buildinfo file path (for that $PKG and $VERSION from bullseye...) from builtin-pho db
+# query .buildinfo file path (for that $PKG and $VERSION from bullseye...) from builtin-pho db
 BUILTINPHOPATH=$(psql -A -t -c "SELECT path FROM builds WHERE source='$PKG' AND source_version='$VERSION' AND ( arch_amd64=true OR arch_all=true ) LIMIT 1" buildinfo)
 if [ -z "$BUILTINPHOPATH" ] ; then
 	output_echo "No .buildinfo file found for $PKG ($VERSION) for $ARCH"
@@ -97,11 +97,11 @@ cd $BTPKG
 output_echo "downloading $URLPATH/$FILE"
 curl $URLPATH/$FILE > $FILE
 if head -1 $FILE | grep -q 'BEGIN PGP SIGNED MESSAGE' ; then
-	# workaround #955050 in devscripts: debrebuild: please accepted signed .buildinfo files
 	TMPFILE=$(mktemp -t debrebuild-buildinfo.XXXXXXXX)
 	cp $FILE $TMPFILE
-	gpg $TMPFILE > $FILE || true # we cannot validate the signature and we don't care
-rm $TMPFILE
+	# workaround #955050 in devscripts: debrebuild: please accepted signed .buildinfo files
+	cat $TMPFILE | gpg > $FILE || true # we cannot validate the signature and we don't care
+	rm $TMPFILE
 	echo
 	output_echo  "$URLPATH/$FILE with gpg signature stripped:"
 else



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/ddfab7ecd9428be3f632a20549112a3698e31ce8
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/20200502/751e4e63/attachment-0001.html>