[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian rebuilder 'thing': fixup SQL query to improve randomness

[Holger Levsen]

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


Commits:
f584dd4c by Holger Levsen at 2020-05-01T16:27:58+02:00
reproducible Debian rebuilder 'thing': fixup SQL query to improve randomness

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
=====================================
@@ -62,7 +62,7 @@ VERSION=$(grep-available -S $PKG -s Version $SOURCES | head -1 | cut -d ' ' -f2)
 output_echo "let's try to rebuild $PKG ($VERSION) from $SUITE/$ARCH"
 
 # query a random .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)
+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"
 	output_echo ".buildinfo files known for $PKG and (arch_amd64 or arch_all)"
@@ -83,7 +83,7 @@ URLPATH="https://buildinfos.debian.net/ftp-master.debian.org/buildinfo/$FTPMASTE
 # FIXME: hack, should be done properly, with cleanup *after* the job run...
 mkdir -p $PWD/rebuilder-prototype
 BTPKG="$PWD/rebuilder-prototype/$PKG"
-mkdir $BTPKG || (rm $BTPKG -r ; mkdir $BTPKG)
+mkdir $BTPKG 2>/dev/null || (rm $BTPKG -r ; mkdir $BTPKG)
 cd $BTPKG
 
 #



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/f584dd4c7614fcd99ebec594ad3e2e7d08f80bc0
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/20200501/1e84d041/attachment-0001.html>