test_gpg.py: also check signature timestamp

[dak.git] / dak / dominate.py

diff --git a/dak/dominate.py b/dak/dominate.py
index be8c52203958486c8ae229a300149efa22f09351..1c77ee66b09cf74476721350128db3c16bdb6a13 100755 (executable)
--- a/dak/dominate.py
+++ b/dak/dominate.py
@@ -134,12 +134,19 @@ def main():
         usage()
     if 'Suite' not in Options:
         query_suites = DBConn().session().query(Suite)
-        suites = [suite.suite_name for suite in query_suites.all()]
-        cnf['Obsolete::Options::Suite'] = ','.join(suites)
+        suites = [suite.suite_name for suite in query_suites]
+        cnf['Obsolete::Options::Suite'] = str(','.join(suites))
+
     Logger = daklog.Logger("dominate")
     session = DBConn().session()
     for suite_name in utils.split_args(Options['Suite']):
         suite = session.query(Suite).filter_by(suite_name = suite_name).one()
+
+        # Skip policy queues. We don't want to remove obsolete packages from those.
+        policy_queue = session.query(PolicyQueue).filter_by(suite=suite).first()
+        if policy_queue is not None:
+            continue
+
         if not suite.untouchable or Options['Force']:
             doDaDoDa(suite.suite_id, session)
     if Options['No-Action']: