[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian: fixup syntax error in previous commit, c7d6f1070

[Holger Levsen]

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


Commits:
3a85591b by Holger Levsen at 2019-05-02T14:56:09Z
reproducible Debian: fixup syntax error in previous commit, c7d6f1070

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

- - - - -
9d977c10 by Holger Levsen at 2019-05-02T14:56:48Z
reproducible Debian: hide implementation detail

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

- - - - -


1 changed file:

- bin/reproducible_pool_buildinfos.sh


Changes:

=====================================
bin/reproducible_pool_buildinfos.sh
=====================================
@@ -81,22 +81,23 @@ do_day(){
 			elif [ "$(readlink -f $FULLTARGET.0)" = "$MONTHPATH/$DAY/$FILE" ] ; then
 				# also ignoring this
 				:
-		else
-			# so far we found three such cases...
-			if [ ! -e "$FULLTARGET.1" ] ; then
-				ln -s $MONTHPATH/$DAY/$FILE $FULLTARGET.1
-				echo "$MONTHPATH/$DAY/$FILE linked from $FULLTARGET.1"
-				let COUNTER+=1
-			elif [ "$(readlink -f $FULLTARGET.1)" = "$MONTHPATH/$DAY/$FILE" ] ; then
-				# 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 three such cases...
+				if [ ! -e "$FULLTARGET.1" ] ; then
+					ln -s $MONTHPATH/$DAY/$FILE $FULLTARGET.1
+					echo "$MONTHPATH/$DAY/$FILE linked from $FULLTARGET.1"
+					let COUNTER+=1
+				elif [ "$(readlink -f $FULLTARGET.1)" = "$MONTHPATH/$DAY/$FILE" ] ; then
+					# 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
+				fi
 			fi
 		fi
 	done
@@ -130,7 +131,8 @@ else
 fi
 
 if [ -s $PROBLEMS ] ; then
-	echo problems stored in $PROBLEMS
+	echo "Problems found, please investigate:"
+	echo
 	cat $PROBLEMS
 	cat $PROBLEMS >> $BASEPATH/buildinfo-problems
 	exit 1



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/c7d6f1070eda784a03e272b3d760380899326fc4...9d977c10b844a31621dba25650ebe9435fabe1b1

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/c7d6f1070eda784a03e272b3d760380899326fc4...9d977c10b844a31621dba25650ebe9435fabe1b1
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/20190502/0a4441bc/attachment-0001.html>