[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: continue updating meta pkg sets even if one fails

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit a5fd4e8ea66f1df71269885882668cdd4aa76812
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Apr 3 12:55:52 2015 +0200

    reproducible: continue updating meta pkg sets even if one fails
---
 TODO                                     |  1 -
 bin/reproducible_create_meta_pkg_sets.sh | 10 +++++-----
 logparse/reproducible.rules              |  1 +
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/TODO b/TODO
index e793aed..2b81613 100644
--- a/TODO
+++ b/TODO
@@ -119,7 +119,6 @@ properties:
 === reproducible
 
 * issues in packages or debbindiff:
-** #781076 causes some ftbfs errors in sid + testing, see: rgrep -l "/usr/bin/make: invalid option" /var/lib/jenkins/userContent/rbuild/testing/
 ** find debbindiff problems: egrep -R -l '(debbindiff had trouble comparing|maybe there is still )' /var/lib/jenkins/userContent/rbuild/
 
 * misc
diff --git a/bin/reproducible_create_meta_pkg_sets.sh b/bin/reproducible_create_meta_pkg_sets.sh
index 67a3307..e38c4bc 100755
--- a/bin/reproducible_create_meta_pkg_sets.sh
+++ b/bin/reproducible_create_meta_pkg_sets.sh
@@ -56,13 +56,13 @@ update_if_similar() {
 				echo diff $TARGET $TARGET.new
 				diff $TARGET $TARGET.new || true
 				echo
-				echo "Too much difference for $TARGET, aborting. Please investigate and update manually."
+				echo "Warning: too much difference for $TARGET, aborting. Please investigate and update manually."
 				rm $TARGET.new
-				exit 1
+			else
+				mv $TMPFILE $TARGET
+				echo "$(date) - $TARGET updated."
 			fi
 		fi
-		mv $TMPFILE $TARGET
-		echo "$(date) - $TARGET updated."
 	else
 		echo "$(date) - $TARGET not updated, $TMPFILE is empty."
 	fi
@@ -286,7 +286,7 @@ for SUITE in $SUITES ; do
 
 	# finally
 	update_pkg_sets
-	echo "$(date) - All meta package sets for $SUITE created successfully."
+	echo "$(date) - Done updating all meta package sets for $SUITE."
 done
 
 rm -f $TMPFILE ${TMPFILE2}
diff --git a/logparse/reproducible.rules b/logparse/reproducible.rules
index 8350eec..7c83ce3 100644
--- a/logparse/reproducible.rules
+++ b/logparse/reproducible.rules
@@ -13,3 +13,4 @@ warning /Warning: could not download.+/
 warning /Warning: the following failed builds have been found/
 warning /Warning: cannot update html pages for.+/
 warning /Warning: package .+is probably already building elsewhere, exiting./
+warning /Warning: too much difference for .+, aborting. Please investigate and update manually./

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git