Commit 4eddbee2 authored by Holger Levsen's avatar Holger Levsen
Browse files

reproducible Debian: improve workaround for quicker cleanup 



Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent a24d1953

bin/reproducible_compare_Debian_sha1sums.sh

+4 −4
Original line number Diff line number Diff line
@@ -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