[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian rebuilder 'thing': fixup hackish fix from b89d482f4

[Holger Levsen]

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


Commits:
0ce15eb0 by Holger Levsen at 2020-05-01T01:38:42+02:00
reproducible Debian rebuilder 'thing': fixup hackish fix from b89d482f4

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

- - - - -


2 changed files:

- bin/rb-debrebuild
- bin/reproducible_debian_rebuilder_prototype.sh


Changes:

=====================================
bin/rb-debrebuild
=====================================
@@ -526,4 +526,4 @@ if ($build_archall) {
 print " -d $base_dist";
 print " $dsc_fname\n";
 
-print "\nBASE_DIST=$base_dist\n";
+print "BASE_DIST=$base_dist\n";


=====================================
bin/reproducible_debian_rebuilder_prototype.sh
=====================================
@@ -118,8 +118,9 @@ echo 'Acquire::Check-Valid-Until "false";' | sudo tee /schroots/debrebuild-$DIST
 #   - using tail
 # - workaround #955304 in devscripts: debrebuild: suggested sbuild command should use --no-run-lintian
 #   - using sed
+# - workaround yet unfiled bug in devscript by tail -2 | grep -v BASE_DIST... (see above)
 output_echo "trying to re-sbuild $PKG..."
-SBUILD=$(tail -1 $DEBREBUILD | sed 's# sbuild # sbuild --no-run-lintian #')
+SBUILD=$(tail -2 $DEBREBUILD | grep -v '^BASE_DIST=' | sed 's# sbuild # sbuild --no-run-lintian #')
 output_echo "using this sbuild call:"
 echo $SBUILD
 echo



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/0ce15eb030d85e1db9dacb713c24aefb0b1239a1
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/20200430/e2edfb1a/attachment.html>