[Piuparts-commits] [piuparts] 01/01: detect_*_issues.in: improve output.

[Holger Levsen]

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

holger pushed a commit to branch develop
in repository piuparts.

commit f325adf8753a92d032b73e898b165431ea57f61d
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Mar 24 12:49:56 2018 +0000

    detect_*_issues.in: improve output.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog                     |  1 +
 master-bin/detect_archive_issues.in  | 11 +++++------
 master-bin/detect_network_issues.in  |  8 +++-----
 master-bin/detect_piuparts_issues.in | 15 ++++++---------
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e2cfbd1..c970541 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 piuparts (0.85) UNRELEASED; urgency=medium
 
   * dwke.py: change logging to make relevant information more visible.
+  * detect_*_issues.in: improve output.
 
  -- Holger Levsen <holger at debian.org>  Fri, 16 Feb 2018 12:47:08 +0000
 
diff --git a/master-bin/detect_archive_issues.in b/master-bin/detect_archive_issues.in
index b4a6545..6f8c6cb 100644
--- a/master-bin/detect_archive_issues.in
+++ b/master-bin/detect_archive_issues.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright © 2009-2017 Holger Levsen (holger at layer-acht.org)
+# Copyright © 2009-2018 Holger Levsen (holger at layer-acht.org)
 # Copyright © 2011-2017 Andreas Beckmann (anbe at debian.org)
 #
 # This program is free software; you can redistribute it and/or modify it
@@ -62,11 +62,6 @@ if [ -s $URLS ]; then
 	echo "Runtime: $RUNTIME"
 	echo
 	echo "Broken packages detected!"
-	echo "(By grep'ing for"
-	echo "        'E: Broken packages',"
-	echo "        'E: Unable to correct problems, you have held broken packages',"
-	echo "        'E: Error, pkgProblemResolver::Resolve generated breaks'"
-	echo "in failed logs.)"
 	echo
 	echo 'The following packages have been moved to $section/untestable and will be'
 	echo "tested again in $DAYS days."
@@ -79,5 +74,9 @@ if [ -s $URLS ]; then
 	echo
 	grep -f $URLS $ISSUE_LOG | sort | uniq -c | sort -rn
 	echo
+	echo "Those problems were found in failed logs by grep'ing for these patterns:"
+	echo "        'E: Broken packages'"
+	echo "        'E: Unable to correct problems, you have held broken packages'"
+	echo "        'E: Error, pkgProblemResolver::Resolve generated breaks'"
 fi
 rm $LOGS $URLS
diff --git a/master-bin/detect_network_issues.in b/master-bin/detect_network_issues.in
index fe9629f..3bd4a81 100644
--- a/master-bin/detect_network_issues.in
+++ b/master-bin/detect_network_issues.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009-2017 Holger Levsen (holger at layer-acht.org)
+# Copyright 2009-2018 Holger Levsen (holger at layer-acht.org)
 # Copyright © 2011-2017 Andreas Beckmann (anbe at debian.org)
 #
 # This program is free software; you can redistribute it and/or modify it
@@ -76,13 +76,9 @@ if [ -s $FILE ] ; then
 	echo "Runtime: $RUNTIME"
 	echo
 	echo "Network problems on detected!"
-	echo "(By grep'ing for"
-	echo "$DISPLAY_PATTERN"
-	echo "in failed logs.)"
 	echo
 	echo "The following logfiles have been deleted:"
 	echo
-	echo "----------------------------------------------------------------------"
 	echo
 	for log in $(sort -u $FILE)
 	do
@@ -91,5 +87,7 @@ if [ -s $FILE ] ; then
 		rm -f "$log"
 	done
 	echo
+	echo "Those problems were found in failed logs by grep'ing for these patterns:"
+	echo "$DISPLAY_PATTERN"
 fi
 rm $FILE
diff --git a/master-bin/detect_piuparts_issues.in b/master-bin/detect_piuparts_issues.in
index ca1f643..7de8c24 100644
--- a/master-bin/detect_piuparts_issues.in
+++ b/master-bin/detect_piuparts_issues.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright © 2009-2017 Holger Levsen (holger at layer-acht.org)
+# Copyright © 2009-2018 Holger Levsen (holger at layer-acht.org)
 # Copyright © 2011-2017 Andreas Beckmann (anbe at debian.org)
 #
 # This program is free software; you can redistribute it and/or modify it
@@ -98,18 +98,12 @@ if [ -s $FILE ] ; then
 	echo "Runtime: $RUNTIME"
 	echo
 	echo "piuparts problems detected!"
-	echo "(By grep'ing for"
-	echo "$DISPLAY_PATTERN"
-	echo "in failed logs.)"
 	echo
-	echo "Please review the following logfiles/packages."
-	echo "If it is always the same package failing, it's likely to be an issue in the"
-	echo "package."
+	echo "Please review the following logfiles/packages. If it is always the same"
+	echo "package failing, it's likely to be an issue in the package."
 	echo
 	echo "The following logfiles have been deleted:"
 	echo
-	echo "----------------------------------------------------------------------"
-	echo
 	for log in $(sort -u $FILE)
 	do
 		echo "$log"
@@ -118,5 +112,8 @@ if [ -s $FILE ] ; then
 		rm -f "$log"
 	done
 	echo
+	echo "Those problems were found in failed logs by grep'ing for these patterns:"
+	echo "$DISPLAY_PATTERN"
+	echo
 fi
 rm $FILE

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