Merge

diff --git a/ChangeLog b/ChangeLog
index e227e68d5c65cc9c62b12c31ac7e1a02315111a8..809cf5eb1c7c53b926c2e37b648cf24db37f7525 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
+2008-04-26  Joerg Jaspert  <joerg@debian.org>
+
+       * config/debian/cron.daily: Also report NBS in experimental
+
 2008-04-25  Joerg Jaspert  <joerg@debian.org>
 
+       * dak/cruft_report.py (main): Make it possible to look at
+       experimental too, especially NBS
+
        * dak/split_done.py (main): Only move files into their subdirs if
        they are older than 30 days. That enables us to run this script as
        part of a cronjob.

diff --git a/config/debian/cron.daily b/config/debian/cron.daily
index 48f746879226bf780f9706bf00875d55a280d160..f40b6d81a1bac9a3e32760cefb9a45655e72c1f3 100755 (executable)
--- a/config/debian/cron.daily
+++ b/config/debian/cron.daily
@@ -173,7 +173,9 @@ TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
 # Send a report on NEW/BYHAND packages
 dak queue-report | mail -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org
 # and one on crufty packages
-dak cruft-report | tee $webdir/cruft-report-daily.txt | mail -e -s "Debian archive cruft report for $(date +%D)" ftpmaster@ftp-master.debian.org
+dak cruft-report > $webdir/cruft-report-daily.txt
+dak cruft-report -s experimental >> $webdir/cruft-report-daily.txt
+cat $webdir/cruft-report-daily.txt | mail -e -s "Debian archive cruft report for $(date +%D)" ftpmaster@ftp-master.debian.org
 
 $scriptsdir/dm-monitor >$webdir/dm-uploaders.html
 

diff --git a/dak/cruft_report.py b/dak/cruft_report.py
index 8571bcf4c5fdeefb316c0f9da776f06b70a0ce12..4969a7c376a9db7821c7667c0246703ea9e49aa7 100755 (executable)
--- a/dak/cruft_report.py
+++ b/dak/cruft_report.py
@@ -36,6 +36,7 @@ import daklib.utils
 
 Cnf = None
 projectB = None
+suite = "unstable" # Default
 suite_id = None
 no_longer_in_suite = {}; # Really should be static to add_nbs, but I'm lazy
 
@@ -171,7 +172,7 @@ def do_nbs(real_nbs):
         print output
 
         print "Suggested command:"
-        print " dak rm -m \"[auto-cruft] NBS\" -b %s" % (" ".join(nbs_to_remove))
+        print " dak rm -m \"[auto-cruft] NBS\" -s %s -b %s" % (suite, " ".join(nbs_to_remove))
         print
 
 ################################################################################
@@ -244,7 +245,7 @@ def do_obsolete_source(duplicate_bins, bin2source):
 ################################################################################
 
 def main ():
-    global Cnf, projectB, suite_id, source_binaries, source_versions
+    global Cnf, projectB, suite, suite_id, source_binaries, source_versions
 
     Cnf = daklib.utils.get_conf()
 
@@ -351,7 +352,10 @@ def main ():
         os.unlink(temp_filename)
 
     # Checks based on the Packages files
-    for component in components + ['main/debian-installer']:
+    check_components = components[:]
+    if suite != "experimental":
+        check_components.append('main/debian-installer');
+    for component in check_components:
         architectures = filter(daklib.utils.real_arch, Cnf.ValueList("Suite::%s::Architectures" % (suite)))
         for architecture in architectures:
             filename = "%s/dists/%s/%s/binary-%s/Packages.gz" % (Cnf["Dir::Root"], suite, component, architecture)