Drop unique .changes name requirement and allow ftpteam to forget seen files.

[dak.git] / dak / rm.py

diff --git a/dak/rm.py b/dak/rm.py
index 5cc12402f8863b9232e9f2beea9487ac2e3261fc..97af8c2c6779593bc7ff3dc6f3904b71d3a1f50b 100755 (executable)
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -167,8 +167,6 @@ def main ():
     if (Options["Do-Close"]
            and (Options["Binary"] or Options["Binary-Only"] or Options["Source-Only"])):
         utils.fubar("No.")
-    if Options["Do-Close"] and Options["Suite"] != 'unstable':
-        utils.fubar("No.")
 
     # Force the admin to tell someone if we're not doing a 'dak
     # cruft-report' inspired removal (or closing a bug, which counts
@@ -244,8 +242,6 @@ def main ():
     if Options["Rdep-Check"] and len(suites) > 1:
         utils.fubar("Reverse dependency check on multiple suites is not implemented.")
 
-    print "Working...",
-    sys.stdout.flush()
     to_remove = []
     maintainers = {}
 
@@ -279,7 +275,6 @@ def main ():
                          JOIN src_associations sa ON s.id = sa.source AND sa.suite = su.id
                     WHERE TRUE %s %s %s %s""" % (con_packages, con_suites, con_components, con_architectures))
             to_remove.extend(q)
-    print "done."
 
     if not to_remove:
         print "Nothing to do."
@@ -468,14 +463,6 @@ def main ():
         summarymail += "----------------------------------------------\n"
         Subst_close_rm["__SUMMARY__"] = summarymail
 
-        whereami = utils.where_am_i()
-        Archive = get_archive(whereami, session)
-        if Archive is None:
-            utils.warn("Cannot find archive %s.  Setting blank values for origin" % whereami)
-            Subst_close_rm["__PRIMARY_MIRROR__"] = ""
-        else:
-            Subst_close_rm["__PRIMARY_MIRROR__"] = Archive.primary_mirror
-
         for bug in utils.split_args(Options["Done"]):
             Subst_close_rm["__BUG_NUMBER__"] = bug
             if Options["Do-Close"]: