X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Frm.py;h=f63b2ca6b80e0f87afcc7d1d4aeb394623ef8d1b;hb=26ec44d74f944fd93a7c136cd754d6931cb04c00;hp=69b35971db1c0d223d5b560c1e82e9c9804355de;hpb=89835d22b84c51c2196eacb1d66765c2c0b6193c;p=dak.git

diff --git a/dak/rm.py b/dak/rm.py
index 69b35971..f63b2ca6 100755
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -44,6 +44,7 @@ import os
 import sys
 import apt_pkg
 import apt_inst
+from re import sub
 
 from daklib.config import Config
 from daklib.dbconn import *
@@ -75,7 +76,7 @@ Remove PACKAGE(s) from suite(s).
   -S, --source-only          remove source only
 
 ARCH, BUG#, COMPONENT and SUITE can be comma (or space) separated lists, e.g.
-    --architecture=m68k,i386"""
+    --architecture=amd64,i386"""
 
     sys.exit(exit_code)
 
@@ -399,7 +400,7 @@ def main ():
             for i in source_packages.keys():
                 filename = "/".join(source_packages[i])
                 try:
-                    dsc = utils.parse_changes(filename)
+                    dsc = utils.parse_changes(filename, dsc_file=1)
                 except CantOpenError:
                     utils.warn("couldn't open '%s'." % (filename))
                     continue
@@ -505,6 +506,37 @@ def main ():
     logfile.write("----------------------------------------------\n")
     logfile.flush()
 
+    # Do the same in rfc822 format
+    logfile822 = utils.open_file(cnf["Rm::LogFile822"], 'a')
+    logfile822.write("Date: %s\n" % date)
+    logfile822.write("Ftpmaster: %s\n" % whoami)
+    logfile822.write("Suite: %s\n" % suites_list)
+    sources = []
+    binaries = []
+    for package in summary.split("\n"):
+        for row in package.split("\n"):
+            element = row.split("|")
+            if len(element) == 3:
+                if element[2].find("source") > 0:
+                    sources.append("%s_%s" % tuple(elem.strip(" ") for elem in element[:2]))
+                    element[2] = sub("source\s?,?", "", element[2]).strip(" ")
+                if element[2]:
+                    binaries.append("%s_%s [%s]" % tuple(elem.strip(" ") for elem in element))
+    if sources:
+        logfile822.write("Sources:\n")
+        for source in sources:
+            logfile822.write(" %s\n" % source)
+    if binaries:
+        logfile822.write("Binaries:\n")
+        for binary in binaries:
+            logfile822.write(" %s\n" % binary)
+    logfile822.write("Reason: %s\n" % Options["Reason"].replace('\n', '\n '))
+    if Options["Done"]:
+        logfile822.write("Bug: %s\n" % Options["Done"])
+    logfile822.write("\n")
+    logfile822.flush()
+    logfile822.close()
+
     dsc_type_id = get_override_type('dsc', session).overridetype_id
     deb_type_id = get_override_type('deb', session).overridetype_id