[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: deal with incorrectly populated files in pool

[Holger Levsen]

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


Commits:
a95bc474 by Holger Levsen at 2019-02-20T15:22:22Z
reproducible Debian: deal with incorrectly populated files in pool

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

- - - - -


1 changed file:

- bin/reproducible_compare_Debian_sha1sums.sh


Changes:

=====================================
bin/reproducible_compare_Debian_sha1sums.sh
=====================================
@@ -82,6 +82,12 @@ for package in $packages ; do
 	pool_dir="$(dirname $(grep-dctrl -X -P ${package} -s Filename -n $PACKAGES))"
 	mkdir -p $pool_dir
 	cd $pool_dir
+	# temp code, only needed to cleanup pool... (from wrong layout before)
+	if [ -e ../${package_file}.sha1output ] || [ -e ../${package_file}.json ] ; then
+		mv ../${package_file}.sha1output . || true
+		mv ../${package_file}.json . || true
+	fi
+	# end temp code
 	if [ ! -e ${package_file}.sha1output ] ; then
 		echo -n "$(date -u) - preparing to download $filename"
 		( schroot --directory  $SHA1DIR/$pool_dir -c chroot:jenkins-reproducible-unstable-diffoscope apt-get download ${package} 2>&1 |xargs echo ) || continue



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/a95bc474d5ba1a52a22b727bd8585efa9dfc6cd9
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/20190220/4a2c5d05/attachment.html>