[Piuparts-commits] [SCM] piatti.debian.org configuration files branch, master, updated. 148332ef45997ba3aaf38cc2c9a28441083bad49

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 69fc9bd9572fc4a1f9dc7ea61475aba5a0ae713c
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Mon Nov 28 12:33:17 2011 +0100

    don't try to match sections with wildcards
    
    wildcard matching does not work for hierarchical sections like
      sid/main
    don't try to access the slave directory - piupartsm doesn't have
    permission to remove files there anyway
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/home/piupartsm/bin/report_stale_reserved_packages b/home/piupartsm/bin/report_stale_reserved_packages
index 9cf9afc..190ec47 100755
--- a/home/piupartsm/bin/report_stale_reserved_packages
+++ b/home/piupartsm/bin/report_stale_reserved_packages
@@ -33,19 +33,17 @@ fi
 # find packages which have been reserved for more than 2 days and unschedule them 
 #
 
+DAYS=2
 LOGS=`mktemp`
-for dir in $MASTER $MASTER/../slave ; do
-	find $dir/*/reserved/ -mtime +2 -name "*.log" 2>/dev/null > $LOGS
-	if [ -s $LOGS ] ; then 
-		for SECTION in $SECTIONS ; do
-        		for package_log in $(grep $SECTION $LOGS) ; do 
-				rm -f $package_log
-			done
-		done
-		echo "Stale reserved packages detected, which have been reserved more then 2 days ago!"
-		echo "These packages have been unscheduled."
-		echo
-		cat "$LOGS"
-	fi
+for SECTION in $SECTIONS ; do
+	find $MASTER/$SECTION/reserved/ -mtime +$DAYS -name "*.log" 2>/dev/null >> $LOGS
 done
+if [ -s $LOGS ] ; then
+	echo "Stale reserved packages detected, which have been reserved more then $DAYS days ago!"
+	echo "These packages have been unscheduled."
+	echo
+	for package_log in $(cat $LOGS) ; do
+		rm -fv $package_log
+	done
+fi
 rm $LOGS
diff --git a/home/piupartsm/bin/report_untestable_packages b/home/piupartsm/bin/report_untestable_packages
index a0bf143..3def3ac 100755
--- a/home/piupartsm/bin/report_untestable_packages
+++ b/home/piupartsm/bin/report_untestable_packages
@@ -35,16 +35,15 @@ fi
 
 DAYS=7
 LOGS=`mktemp`
-find $MASTER/*/untestable/ -mtime +$DAYS -name "*.log" 2>/dev/null > $LOGS
+for SECTION in $SECTIONS ; do
+	find $MASTER/$SECTION/untestable/ -mtime +$DAYS -name "*.log" 2>/dev/null >> $LOGS
+done
 if [ -s $LOGS ] ; then 
-	for SECTION in $SECTIONS ; do
-        	for package_log in $(grep $SECTION $LOGS) ; do 
-			rm -f $package_log
-		done
-	done
 	echo "Untestable packages detected, which have been tested more than $DAYS days ago!"
 	echo "These packages have been rescheduling for piuparts testing."
 	echo
-	cat "$LOGS"
+	for package_log in $(cat $LOGS) ; do
+		rm -fv $package_log
+	done
 fi
 rm $LOGS

-- 
piatti.debian.org configuration files