control_suite.py: generate changelog for britney runs

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 9f41d69d0f734c184b88e58ede36af51bde91002..1dd52a4e8e594c48b4977cc79d18e166c3524e43 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -778,4 +778,5 @@ Common
 Changelogs
 {
   Testing "/srv/release.debian.org/tools/trille/current-testing";
+  Britney "/srv/ftp-master.debian.org/ftp/dists/testing/ChangeLog";
 }

diff --git a/dak/control_suite.py b/dak/control_suite.py
index d8f8227b2320e4d8302670f4757a180c7a84a26e..03cb73d57909fde42f03480658b17586559e0005 100755 (executable)
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -63,7 +63,8 @@ Display or alter the contents of a suite using FILE(s), or stdin.
   -h, --help                 show this help and exit
   -l, --list=SUITE           list the contents of SUITE
   -r, --remove=SUITE         remove from SUITE
-  -s, --set=SUITE            set SUITE"""
+  -s, --set=SUITE            set SUITE
+  -b, --britney              generate changelog entry for britney runs"""
 
     sys.exit(exit_code)
 
@@ -93,7 +94,58 @@ def get_id(package, version, architecture, session):
 
 #######################################################################################
 
-def set_suite(file, suite, session):
+def britney_changelog(packages, suite, session):
+
+    old = {}
+    current = {}
+
+    q = session.execute("""SELECT s.source, s.version, sa.id
+                             FROM source s, src_associations sa
+                            WHERE sa.suite = :suiteid
+                              AND sa.source = s.id""", {'suiteid': suite.suite_id})
+
+    for p in q.fetchall():
+        current[p[0]] = p[1]
+    for p in packages.keys():
+        p = p.split()
+        if p[2] == "source":
+            old[p[0]] = p[1]
+
+    new = {}
+    for p in current.keys():
+        if p in old.keys():
+            if apt_pkg.VersionCompare(current[p], old[p]) > 0:
+                new[p] = [current[p], old[p]]
+        else:
+            new[p] = [current[p], 0]
+
+    query =  "SELECT source, changelog FROM changelogs WHERE"
+    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 += " False ORDER BY source, version DESC"
+    q = session.execute(query)
+
+    pu = None
+    brit = utils.open_file(Config()["Changelogs::Britney"], 'w')
+
+    for u in q:
+        if pu and pu != u[0]:
+            brit.write("\n")
+        brit.write("%s\n" % u[1])
+        pu = u[0]
+    if len(u): brit.write("\n\n\n")
+
+    for p in list(set(old.keys()).difference(current.keys())):
+        brit.write("REMOVED: %s %s\n" % (p, old[p]))
+
+    brit.flush()
+    brit.close()
+
+#######################################################################################
+
+def set_suite(file, suite, session, britney=False):
     suite_id = suite.suite_id
     lines = file.readlines()
 
@@ -155,11 +207,14 @@ def set_suite(file, suite, session):
 
     session.commit()
 
+    if britney:
+        britney_changelog(current, suite, session)
+
 #######################################################################################
 
-def process_file(file, suite, action, session):
+def process_file(file, suite, action, session, britney=False):
     if action == "set":
-        set_suite(file, suite, session)
+        set_suite(file, suite, session, britney)
         return
 
     suite_id = suite.suite_id
@@ -262,12 +317,13 @@ def main ():
     cnf = Config()
 
     Arguments = [('a',"add","Control-Suite::Options::Add", "HasArg"),
+                 ('b',"britney","Control-Suite::Options::Britney"),
                  ('h',"help","Control-Suite::Options::Help"),
                  ('l',"list","Control-Suite::Options::List","HasArg"),
                  ('r',"remove", "Control-Suite::Options::Remove", "HasArg"),
                  ('s',"set", "Control-Suite::Options::Set", "HasArg")]
 
-    for i in ["add", "help", "list", "remove", "set", "version" ]:
+    for i in ["add", "britney", "help", "list", "remove", "set", "version" ]:
         if not cnf.has_key("Control-Suite::Options::%s" % (i)):
             cnf["Control-Suite::Options::%s" % (i)] = ""
 
@@ -305,15 +361,19 @@ def main ():
     if action == "set" and suite_name not in ["testing"]:
         utils.fubar("Will not reset suite %s" % (suite_name))
 
+    britney = False
+    if action == "set" and cnf["Control-Suite::Options::Britney"]:
+        britney = True
+
     if action == "list":
         get_list(suite, session)
     else:
         Logger = daklog.Logger(cnf.Cnf, "control-suite")
         if file_list:
             for f in file_list:
-                process_file(utils.open_file(f), suite, action, session)
+                process_file(utils.open_file(f), suite, action, session, britney)
         else:
-            process_file(sys.stdin, suite, action, session)
+            process_file(sys.stdin, suite, action, session, britney)
         Logger.close()
 
 #######################################################################################

diff --git a/scripts/debian/import_testing.sh b/scripts/debian/import_testing.sh
index 8eeff8445c9202397eddac34b4b40b06f5d64c5a..616d7ee2f4ba05722157340209f043fc18236e05 100755 (executable)
--- a/scripts/debian/import_testing.sh
+++ b/scripts/debian/import_testing.sh
@@ -37,7 +37,7 @@ cd $masterdir
 echo "Importing new data for testing into projectb"
 
 # Now load the data
-cat $TESTINGINPUT | dak control-suite --set testing
+cat $TESTINGINPUT | dak control-suite --set testing --britney
 
 echo "Done"