X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcontrol_suite.py;h=9eb8ae22ce379f6465d04a940ff2449a112606e1;hb=39cdc8cc1607dbacfcdbf8182e3a024c05737fe4;hp=03cb73d57909fde42f03480658b17586559e0005;hpb=b9d08748685fb49aee70a702b6bae55385393f39;p=dak.git diff --git a/dak/control_suite.py b/dak/control_suite.py index 03cb73d5..9eb8ae22 100755 --- a/dak/control_suite.py +++ b/dak/control_suite.py @@ -123,7 +123,8 @@ def britney_changelog(packages, suite, session): for p in new.keys(): query += " source = '%s' AND version > '%s' AND version <= '%s'" \ % (p, new[p][1], new[p][0]) - query += " AND architecture LIKE '%source%' OR" + query += " AND architecture LIKE '%source%' AND distribution in \ + ('unstable', 'experimental', 'testing-proposed-updates') OR" query += " False ORDER BY source, version DESC" q = session.execute(query) @@ -135,7 +136,7 @@ def britney_changelog(packages, suite, session): brit.write("\n") brit.write("%s\n" % u[1]) pu = u[0] - if len(u): brit.write("\n\n\n") + if q.rowcount: brit.write("\n\n\n") for p in list(set(old.keys()).difference(current.keys())): brit.write("REMOVED: %s %s\n" % (p, old[p]))