Merge commit 'ftpmaster/master' into sqlalchemy

[dak.git] / dak / transitions.py

diff --git a/dak/transitions.py b/dak/transitions.py
index 4080f3e63b3ed8a7febc235438d39ac6dc37c055..9c4e7d8bc7e97010b23d0dc1b21f349e723f2c93 100755 (executable)
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -29,7 +29,6 @@ Display, edit and check the release manager's transition file.
 ################################################################################
 
 import os
-import pg
 import sys
 import time
 import errno
@@ -37,7 +36,8 @@ import fcntl
 import tempfile
 import pwd
 import apt_pkg
-from daklib import database
+
+from daklib.dbconn import *
 from daklib import utils
 from daklib.dak_exceptions import TransitionsError
 from daklib.regexes import re_broken_package
@@ -46,7 +46,6 @@ import yaml
 # Globals
 Cnf = None      #: Configuration, apt_pkg.Configuration
 Options = None  #: Parsed CommandLine arguments
-projectB = None #: database connection, pgobject
 
 ################################################################################
 
@@ -60,7 +59,7 @@ def init():
     @attention: This function may run B{within sudo}
 
     """
-    global Cnf, Options, projectB
+    global Cnf, Options
 
     apt_pkg.init()
 
@@ -85,15 +84,13 @@ def init():
     if Options["help"]:
         usage()
 
-    whoami = os.getuid()
-    whoamifull = pwd.getpwuid(whoami)
-    username = whoamifull[0]
+    username = utils.getusername()
     if username != "dak":
         print "Non-dak user: %s" % username
         Options["sudo"] = "y"
 
-    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
-    database.init(Cnf, projectB)
+    # Initialise DB connection
+    DBConn()
 
 ################################################################################
 
@@ -399,22 +396,26 @@ def check_transitions(transitions):
     to_dump = 0
     to_remove = []
     info = {}
+
+    session = DBConn().session()
+
     # Now look through all defined transitions
     for trans in transitions:
         t = transitions[trans]
         source = t["source"]
         expected = t["new"]
 
-        # Will be None if nothing is in testing.
-        current = database.get_suite_version(source, "testing")
+        # Will be an empty list if nothing is in testing.
+        sources = get_source_in_suite(source, "testing", session)
 
         info[trans] = get_info(trans, source, expected, t["rm"], t["reason"], t["packages"])
         print info[trans]
 
-        if current == None:
+        if len(sources) < 1:
             # No package in testing
             print "Transition source %s not in testing, transition still ongoing." % (source)
         else:
+            current = sources[0].version
             compare = apt_pkg.VersionCompare(current, expected)
             if compare < 0:
                 # This is still valid, the current version in database is older than
@@ -452,27 +453,28 @@ def check_transitions(transitions):
         elif answer == 'y':
             print "Committing"
             subst = {}
+            subst['__SUBJECT__'] = "Transitions completed: " + ", ".join(sorted(to_remove))
             subst['__TRANSITION_MESSAGE__'] = "The following transitions were removed:\n"
-            for remove in to_remove:
+            for remove in sorted(to_remove):
                 subst['__TRANSITION_MESSAGE__'] += info[remove] + '\n'
                 del transitions[remove]
 
-            edit_file = temp_transitions_file(transitions)
-            write_transitions_from_file(edit_file)
-
             # If we have a mail address configured for transitions,
             # send a notification
             subst['__TRANSITION_EMAIL__'] = Cnf.get("Transitions::Notifications", "")
             if subst['__TRANSITION_EMAIL__'] != "":
-                print "Sending notification to %s" % subst['__TRANSITION__EMAIL__']
+                print "Sending notification to %s" % subst['__TRANSITION_EMAIL__']
                 subst['__DAK_ADDRESS__'] = Cnf["Dinstall::MyEmailAddress"]
                 subst['__BCC__'] = 'X-DAK: dak transitions'
                 if Cnf.has_key("Dinstall::Bcc"):
-                    subst["__BCC__"] += '\nBcc: %s' % Cnf["Dinstall:Bcc"]
+                    subst["__BCC__"] += '\nBcc: %s' % Cnf["Dinstall::Bcc"]
                 message = utils.TemplateSubst(subst,
                                               os.path.join(Cnf["Dir::Templates"], 'transition.removed'))
                 utils.send_mail(message)
 
+            edit_file = temp_transitions_file(transitions)
+            write_transitions_from_file(edit_file)
+
             print "Done"
         else:
             print "WTF are you typing?"
@@ -527,15 +529,16 @@ def transition_info(transitions):
         source = t["source"]
         expected = t["new"]
 
-        # Will be None if nothing is in testing.
-        current = database.get_suite_version(source, "testing")
+        # Will be empty list if nothing is in testing.
+        sources = get_suite_version(source, "testing")
 
         print get_info(trans, source, expected, t["rm"], t["reason"], t["packages"])
 
-        if current == None:
+        if len(sources) < 1:
             # No package in testing
             print "Transition source %s not in testing, transition still ongoing." % (source)
         else:
+            current = sources[0].version
             compare = apt_pkg.VersionCompare(current, expected)
             print "Apt compare says: %s" % (compare)
             if compare < 0: