[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: also deal with 4 .buildinfo files with the same name

[Holger Levsen]

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


Commits:
951dd1c0 by Holger Levsen at 2019-05-03T13:08:59Z
reproducible Debian: also deal with 4 .buildinfo files with the same name

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

- - - - -


1 changed file:

- bin/reproducible_pool_buildinfos.sh


Changes:

=====================================
bin/reproducible_pool_buildinfos.sh
=====================================
@@ -82,7 +82,7 @@ do_day(){
 				# also ignoring this
 				:
 			else
-				# so far we found three such cases...
+				# so far we found three such cases... (out of one million .buildinfo files)
 				if [ ! -e "$FULLTARGET.1" ] ; then
 					ln -s $MONTHPATH/$DAY/$FILE $FULLTARGET.1
 					echo "$MONTHPATH/$DAY/$FILE linked from $FULLTARGET.1"
@@ -91,12 +91,24 @@ do_day(){
 					# also ignoring this
 					:
 				else
-					# so far, no such case has been found
-					echo "oh no $FULLTARGET.1 also exists and thus we don't know what to do, thus ignoring." >> $PROBLEMS
-					echo "$MONTHPATH/$DAY/$FILE is the source of the problem" >> $PROBLEMS
-					ls -l $FULLTARGET >> $PROBLEMS
-					ls -l $FULLTARGET.0 >> $PROBLEMS
-					echo >> $PROBLEMS
+					# so far we found one such case...
+					if [ ! -e "$FULLTARGET.2" ] ; then
+						ln -s $MONTHPATH/$DAY/$FILE $FULLTARGET.2
+						echo "$MONTHPATH/$DAY/$FILE linked from $FULLTARGET.2"
+						let COUNTER+=1
+					elif [ "$(readlink -f $FULLTARGET.2)" = "$MONTHPATH/$DAY/$FILE" ] ; then
+						# also ignoring this
+						:
+					else
+						# so far, no such case has been found
+						echo "oh no $FULLTARGET.2 also exists and thus we don't know what to do, thus ignoring." >> $PROBLEMS
+						echo "$MONTHPATH/$DAY/$FILE is the source of the problem" >> $PROBLEMS
+						ls -l $FULLTARGET >> $PROBLEMS
+						ls -l $FULLTARGET.0 >> $PROBLEMS
+						ls -l $FULLTARGET.1 >> $PROBLEMS
+						ls -l $FULLTARGET.2 >> $PROBLEMS
+						echo >> $PROBLEMS
+					fi
 				fi
 			fi
 		fi



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/951dd1c061c348f07b22bf9e5ce0a7374840e8c8
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/20190503/945af6b0/attachment-0001.html>