merge ftpmaster branch

[dak.git] / dak / clean_suites.py

diff --git a/dak/clean_suites.py b/dak/clean_suites.py
old mode 100755 (executable)
new mode 100644 (file)
index a59d6e3..cb7225b
--- a/dak/clean_suites.py
+++ b/dak/clean_suites.py
@@ -250,7 +250,7 @@ def clean_maintainers():
     q = projectB.query("""
 SELECT m.id FROM maintainer m
   WHERE NOT EXISTS (SELECT 1 FROM binaries b WHERE b.maintainer = m.id)
-    AND NOT EXISTS (SELECT 1 FROM source s WHERE s.maintainer = m.id)
+    AND NOT EXISTS (SELECT 1 FROM source s WHERE s.maintainer = m.id OR s.changedby = m.id)
     AND NOT EXISTS (SELECT 1 FROM src_uploaders u WHERE u.maintainer = m.id)""")
     ql = q.getresult()
 
@@ -325,8 +325,8 @@ def main():
 
     Cnf = daklib.utils.get_conf()
     for i in ["Help", "No-Action" ]:
-       if not Cnf.has_key("Clean-Suites::Options::%s" % (i)):
-           Cnf["Clean-Suites::Options::%s" % (i)] = ""
+        if not Cnf.has_key("Clean-Suites::Options::%s" % (i)):
+            Cnf["Clean-Suites::Options::%s" % (i)] = ""
 
     Arguments = [('h',"help","Clean-Suites::Options::Help"),
                  ('n',"no-action","Clean-Suites::Options::No-Action")]
@@ -355,4 +355,3 @@ def main():
 
 if __name__ == '__main__':
     main()
-