diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-09-06 14:01:07 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-09-06 14:01:07 +0200 |
| commit | 47b87c6c3cbf548ed51a936606196ba8b9a8ba98 (patch) | |
| tree | 2ffd35781c3c89765bd7bd120bd7f3723745047c | |
| parent | d66cd2a0443ae671633546c7f43ce8e128581e00 (diff) | |
| download | jenkins.debian.net-47b87c6c3cbf548ed51a936606196ba8b9a8ba98.tar.xz | |
reproducible: reword notes warnings and make the job not fail if package was removed
| -rwxr-xr-x | bin/reproducible_notes.py | 7 | ||||
| -rw-r--r-- | logparse/reproducible.rules | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/reproducible_notes.py b/bin/reproducible_notes.py index b6173598..80e07348 100755 --- a/bin/reproducible_notes.py +++ b/bin/reproducible_notes.py @@ -39,7 +39,8 @@ def load_notes(): try: assert 'version' in original[pkg] except AssertionError: - print_critical_message(pkg + ' did not include a version') + print_critical_message(pkg + ' does not include a version') + irc_msg('The note for ' + pkg + ' does not include a version.') query = 'SELECT s.id, s.version, s.suite ' + \ 'FROM results AS r JOIN sources AS s ON r.package_id=s.id' + \ ' WHERE s.name="{pkg}" AND r.status != ""' + \ @@ -47,12 +48,12 @@ def load_notes(): query = query.format(pkg=pkg) result = query_db(query) if not result: - print_critical_message('Warning: This query produces no results: ' + query + print_warning_message('Warning: This query produces no results: ' + query + '\nThis means there is no tested ' + 'package with the name ' + pkg) try: irc_msg('There is problem with the note for ' + pkg + - ' - please have a look at ' + os.environ['BUILD_URL']) + ' - please check ' + os.environ['BUILD_URL']) except KeyError: log.error('There is a problem with the note for %s - please ' 'check.', pkg) diff --git a/logparse/reproducible.rules b/logparse/reproducible.rules index 1d34aad2..0856d5d9 100644 --- a/logparse/reproducible.rules +++ b/logparse/reproducible.rules @@ -13,7 +13,6 @@ warning /Warning: could not download.+/ 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./ -warning /Warning: This query produces no results:.+/ warning /Warning: couldn't delete old files from.+/ warning /Warning: dose-deb-coinstall cannot.+/ warning /Warning: failed to update the .+ schroot./ |