convert transitions.py to new API

[dak.git] / dak / process_accepted.py

diff --git a/dak/process_accepted.py b/dak/process_accepted.py
index 9883bb206de77c0e7b5a9780769482534cf774aa..661016c9a1e3d27eff2820b069ace24d323adbaf 100755 (executable)
--- a/dak/process_accepted.py
+++ b/dak/process_accepted.py
@@ -43,9 +43,10 @@ import time
 import re
 import apt_pkg, commands
 from daklib import database
-from daklib import logging
+from daklib import daklog
 from daklib import queue
 from daklib import utils
+from daklib.binary import copy_temporary_contents
 from daklib.dak_exceptions import *
 from daklib.regexes import re_default_answer, re_issource, re_fdnic
 
@@ -396,7 +397,7 @@ def install ():
                 suite_id = database.get_suite_id(suite)
                 projectB.query("INSERT INTO bin_associations (suite, bin) VALUES (%d, currval('binaries_id_seq'))" % (suite_id))
 
-            if not database.copy_temporary_contents(package, version, architecture, newfile, reject):
+            if not copy_temporary_contents(package, version, architecture, newfile, reject):
                 print "REJECT\n" + reject_message,
                 projectB.query("ROLLBACK")
                 raise MissingContents, "No contents stored for package %s, and couldn't determine contents of %s" % (package, newfile )
@@ -649,7 +650,7 @@ def main():
                 utils.fubar("Couldn't obtain lock; assuming another 'dak process-accepted' is already running.")
             else:
                 raise
-        Logger = Upload.Logger = logging.Logger(Cnf, "process-accepted")
+        Logger = Upload.Logger = daklog.Logger(Cnf, "process-accepted")
         if not installing_to_stable and Cnf.get("Dir::UrgencyLog"):
             Urgency_Logger = Urgency_Log(Cnf)