[Piuparts-commits] rev 377 - piatti/home/piupartsm/bin

[Holger Levsen]

Author: holger
Date: 2009-04-28 11:42:57 +0000 (Tue, 28 Apr 2009)
New Revision: 377

Modified:
   piatti/home/piupartsm/bin/detect_archive_issues
   piatti/home/piupartsm/bin/detect_slave_problems
   piatti/home/piupartsm/bin/report_persistent_untestable_packages
   piatti/home/piupartsm/bin/report_untestable_packages
Log:
improve errorhandling, some bugfixes, disable daily screenlog mail

Modified: piatti/home/piupartsm/bin/detect_archive_issues
===================================================================
--- piatti/home/piupartsm/bin/detect_archive_issues	2009-04-27 16:23:42 UTC (rev 376)
+++ piatti/home/piupartsm/bin/detect_archive_issues	2009-04-28 11:42:57 UTC (rev 377)
@@ -16,20 +16,22 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
+MASTER=/org/piuparts.debian.org/master
+DISTROS="sid squeeze"
+
 #
 # detect packages which are/were untestable due to archive issue and mark them as such
 #
 
-MASTER=/org/piuparts.debian.org/master
-DISTROS="sid squeeze"
-
 LOGS=`mktemp`
-
 for distro in $DISTROS ; do 
-	rgrep -l "E: Broken packages" $MASTER/$distro/fail >> $LOGS
-        grep $distro $FILE | xargs mv $MASTER/$distro/untestable/
+	rgrep -l "E: Broken packages" $MASTER/$distro/fail 2>/dev/null >> $LOGS
+        if [ -s $LOGS ] ; then 
+          for package_log in $(grep $distro $LOGS) ; do 
+		mv $package_log $MASTER/$distro/untestable/
+	  done
+        fi
 done
-
 if [ -s $LOGS ] ; then 
 	echo "Broken packages detected!"
 	echo 

Modified: piatti/home/piupartsm/bin/detect_slave_problems
===================================================================
--- piatti/home/piupartsm/bin/detect_slave_problems	2009-04-27 16:23:42 UTC (rev 376)
+++ piatti/home/piupartsm/bin/detect_slave_problems	2009-04-28 11:42:57 UTC (rev 377)
@@ -53,6 +53,8 @@
 #
 # send screenlog daily no matter what, but only once a day :)
 #
+# disabled, report should be enough to confirm the slave is still running...
+exit 0
 HOUR=`date +%H`
 if [ "$HOUR" = "00" ] ; then
 	touch screenlog.yesterday

Modified: piatti/home/piupartsm/bin/report_persistent_untestable_packages
===================================================================
--- piatti/home/piupartsm/bin/report_persistent_untestable_packages	2009-04-27 16:23:42 UTC (rev 376)
+++ piatti/home/piupartsm/bin/report_persistent_untestable_packages	2009-04-28 11:42:57 UTC (rev 377)
@@ -24,11 +24,12 @@
 # find packages which are in the untestable-archive but have been tested by now,
 # remove those logs so the won't show up later
 #
+
 for distro in $DISTROS ; do
-	for package_log in $(find $MASTER/$distro/untestable/archive/ -name "*.log"); do
+	for package_log in $(find $MASTER/$distro/untestable/archive/ -name "*.log" 2>/dev/null); do
 		for dir in "pass failed bugged" ; do
-			FILE=$(basename $package_log)
-			if [ -f $MASTER/$distro/$dir/$FILE ] ; then
+			file=$(basename $package_log)
+			if [ -f $MASTER/$distro/$dir/$file ] ; then
 				rm $package_log
 			fi
 		done
@@ -39,7 +40,8 @@
 # find packages which have been in untestable for more than $DAYS days and reschedule them for testing
 #
 
-find $MASTER/*/untestable/archive -mtime +$DAYS -name "*.log" > $LOGS
+LOGS=`mktemp`
+find $MASTER/*/untestable/archive -mtime +$DAYS -name "*.log" 2>/dev/null > $LOGS
 if [ -s $LOGS ] ; then 
 	for package_log in $(cat $LOGS) ; do 
 		rm -f $package_log

Modified: piatti/home/piupartsm/bin/report_untestable_packages
===================================================================
--- piatti/home/piupartsm/bin/report_untestable_packages	2009-04-27 16:23:42 UTC (rev 376)
+++ piatti/home/piupartsm/bin/report_untestable_packages	2009-04-28 11:42:57 UTC (rev 377)
@@ -25,7 +25,7 @@
 #
 
 LOGS=`mktemp`
-find $MASTER/*/untestable/ -mtime +$DAYS -name "*.log" > $LOGS
+find $MASTER/*/untestable/ -mtime +$DAYS -name "*.log" 2>/dev/null > $LOGS
 if [ -s $LOGS ] ; then 
 	for distro in $DISTROS ; do
 		mkdir -p $MASTER/$distro/untestable/archive