diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-04-03 12:55:52 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-04-03 12:55:52 +0200 |
| commit | a5fd4e8ea66f1df71269885882668cdd4aa76812 (patch) | |
| tree | 42bee97165dbf5398ae268dd62ec947601948136 | |
| parent | bcc697c4ebb0f7ae0098607bd0b38773ee7bdf59 (diff) | |
| download | jenkins.debian.net-a5fd4e8ea66f1df71269885882668cdd4aa76812.tar.xz | |
reproducible: continue updating meta pkg sets even if one fails
| -rw-r--r-- | TODO | 1 | ||||
| -rwxr-xr-x | bin/reproducible_create_meta_pkg_sets.sh | 10 | ||||
| -rw-r--r-- | logparse/reproducible.rules | 1 |
3 files changed, 6 insertions, 6 deletions
@@ -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 67a3307e..e38c4bc7 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 8350eece..7c83ce3b 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./ |