summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-09-22 21:14:15 +0200
committerHolger Levsen <holger@layer-acht.org>2015-09-22 21:14:15 +0200
commitbda368207156a0b49897d95c6e42fcd2ca20318a (patch)
tree99ffe6b24a63f70c4c5948825724c2584497c548
parent53c25f4ab2f1ee76e142501b0ab7bd64673409d7 (diff)
downloadjenkins.debian.net-bda368207156a0b49897d95c6e42fcd2ca20318a.tar.xz
reproducible: use usual order: suite/arch/pkg
-rwxr-xr-xbin/reproducible_html_breakages.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/reproducible_html_breakages.py b/bin/reproducible_html_breakages.py
index 8e225fb5..032cf23c 100755
--- a/bin/reproducible_html_breakages.py
+++ b/bin/reproducible_html_breakages.py
@@ -26,14 +26,14 @@ def unrep_with_dbd_issues():
eversion + '.debbindiff.html'
if not os.access(dbd, os.R_OK):
without_dbd.append((pkg, version, suite, arch))
- log.warning(pkg + '/' + suite + '/' + arch + ' (' + version + ') is '
+ log.warning(suite + '/' + arch + '/' + pkg + ' (' + version + ') is '
'unreproducible without diffoscope file.')
else:
log.debug(dbd + ' found.')
data = open(dbd, 'br').read(3)
if b'<' not in data:
bad_dbd.append((pkg, version, suite, arch))
- log.warning(pkg + '/' + suite + '/' + arch + ' (' + version + ') has '
+ log.warning(suite + '/' + arch + '/' + pkg + ' (' + version + ') has '
'diffoscope output, but it does not seem to '
'be an html page.')
return without_dbd, bad_dbd
@@ -53,7 +53,7 @@ def not_unrep_with_dbd_file():
eversion + '.debbindiff.html'
if os.access(dbd, os.R_OK):
bad_pkgs.append((pkg, version, suite, arch))
- log.warning(pkg + '/' + suite + '/' + arch + ' (' + version + ') has a '
+ log.warning(suite + '/' + arch + '/' + pkg + ' (' + version + ') has a '
'diffoscope file but it\'s not unreproducible.')
return bad_pkgs
@@ -69,7 +69,7 @@ def lack_rbuild():
for pkg, version, suite, arch in results:
if not pkg_has_rbuild(pkg, version, suite, arch):
bad_pkgs.append((pkg, version, suite, arch))
- log.warning(pkg + '/' + suite + '/' + arch + ' (' + version + ') has been '
+ log.warning(suite + '/' + arch + '/' + pkg + ' (' + version + ') has been '
'built, but a buildlog is missing.')
return bad_pkgs
@@ -89,7 +89,7 @@ def lack_buildinfo():
'_' + eversion + '_' + arch + '.buildinfo'
if not os.access(buildinfo, os.R_OK):
bad_pkgs.append((pkg, version, suite, arch))
- log.warning(pkg + '/' + suite + '/' + arch + ' (' + version + ') has been '
+ log.warning(suite + '/' + arch + '/' + pkg + ' (' + version + ') has been '
'successfully built, but a .buildinfo is missing')
return bad_pkgs
@@ -115,7 +115,7 @@ def pbuilder_dep_fail():
for line in fd:
if re.search(b'E: pbuilder-satisfydepends failed.', line):
bad_pkgs.append((pkg, version, suite, arch))
- log.warning(pkg + '/' + suite + '/' + arch + ' (' + version +
+ log.warning(suite + '/' + arch + '/' + pkg + ' (' + version +
') failed to met its dependencies.')
return bad_pkgs