[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: improve workaround for quicker cleanup

[Holger Levsen]

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


Commits:
4eddbee2 by Holger Levsen at 2019-02-20T15:43:44Z
reproducible Debian: improve workaround for quicker cleanup

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
=====================================
@@ -84,13 +84,13 @@ for package in $packages ; do
 	package_file="${package}_$(echo $version | sed 's#:#%3a#')_${arch}.deb"
 	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
+	if [ -e ${package_file}.sha1output ] || [ ${package_file}.json ] ; then
+		mv ${package_file}.sha1output $pool_dir || true
+		mv ${package_file}.json $pool_dir || true
 	fi
 	# end temp code
+	cd $pool_dir
 	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/4eddbee2778281d2036e6fbe6ea7c95e9cd73418

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/4eddbee2778281d2036e6fbe6ea7c95e9cd73418
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/0e4c47b4/attachment-0001.html>