summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2017-01-25 01:54:30 +0100
committerHolger Levsen <holger@layer-acht.org>2017-01-25 01:54:30 +0100
commitc38ffaffb0595be4c5ec155072ed44565ee656ab (patch)
tree34dc9ee4cd74cf30a09549fdcfb564b37b8198b7 /bin
parent3e487d2f2ebe6d11b4923d596a9c6ba7343f3b1e (diff)
downloadjenkins.debian.net-c38ffaffb0595be4c5ec155072ed44565ee656ab.tar.xz
fixup 43c0ed4: reproducible Debian: also provide summaries for other log types than stale builds
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_html_breakages.py6
-rwxr-xr-xbin/reproducible_maintenance.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/reproducible_html_breakages.py b/bin/reproducible_html_breakages.py
index e2a42f11..6990e6d3 100755
--- a/bin/reproducible_html_breakages.py
+++ b/bin/reproducible_html_breakages.py
@@ -175,9 +175,9 @@ def alien_log(directory=None):
if os.path.getmtime('/'.join([root, file]))<time.time()-86400:
os.remove('/'.join([root, file]))
log.warning('/'.join([root, file]) + ' should not be there and and was older than a day so it was removed.')
- else:
bad_files.append('/'.join([root, file]))
- log.info('/'.join([root, file]) + ' should not be there, but is also less than 24h old and will probably soon be gone.')
+ else:
+ log.info('/'.join([root, file]) + ' should not be there, but is also less than 24h old and will probably soon be gone. Probably diffoscope is running on that package right now.')
except FileNotFoundError:
pass # that bad file is already gone.
return bad_files
@@ -212,9 +212,9 @@ def alien_buildinfo():
try:
if os.path.getmtime('/'.join([root, file]))<time.time()-86400:
os.remove('/'.join([root, file]))
+ bad_files.append('/'.join([root, file]))
log.warning('/'.join([root, file]) + ' should not be there and and was older than a day so it was removed.')
else:
- bad_files.append('/'.join([root, file]))
log.info('/'.join([root, file]) + ' should not be there, but is also less than 24h old and will probably soon be gone.')
except FileNotFoundError:
pass # that bad file is already gone.
diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh
index cf95adaf..80a8f0fc 100755
--- a/bin/reproducible_maintenance.sh
+++ b/bin/reproducible_maintenance.sh
@@ -472,8 +472,8 @@ if [ "$HOSTNAME" = "$MAINNODE" ] && [ $(date -u +%H) -eq 0 ] ; then
else
OTHERPROJECTS="archlinux fedora"
fi
+ echo "$(grep -c https $PROBLEM || echo 0) entries found:" >> $TMPFILE
for a in $ARCHS $OTHERPROJECTS; do
- echo "$(grep -c https $PROBLEM || echo 0) entries found:" >> $TMPFILE
echo "- $(grep https $PROBLEM|grep -c _$a) from $a." >> $TMPFILE
done
elif grep -q 'stale builds found' $PROBLEM ; then