Merge commit 'ftpmaster/master'

[dak.git] / dak / process_upload.py

diff --git a/dak/process_upload.py b/dak/process_upload.py
index 623fe031d64454eac134d201c5a76ded08494102..155ba1dd124823a719ddd44c8b50113d2125ecc7 100755 (executable)
--- a/dak/process_upload.py
+++ b/dak/process_upload.py
@@ -291,9 +291,7 @@ def action(u, session):
     elif answer == 'P':
         if not chg:
             chg = u.pkg.add_known_changes(holding.holding_dir, session)
-        move_to_queue(u, policyqueue, perms=0664, announce=None)
-        chg.in_queue = policyqueue.queue_id
-        session.add(chg)
+        package_to_queue(u, summary, short_summary, policyqueue, chg, session)
         session.commit()
         u.remove()
     elif answer == queuekey:
@@ -479,8 +477,8 @@ def main():
         sets = "set"
         if summarystats.accept_count > 1:
             sets = "sets"
-        sys.stderr.write("Installed %d package %s, %s.\n" % (summarystats.accept_count, sets,
-                                                             utils.size_type(int(summarystats.accept_bytes))))
+        print "Installed %d package %s, %s." % (summarystats.accept_count, sets,
+                                                utils.size_type(int(summarystats.accept_bytes)))
         Logger.log(["total", summarystats.accept_count, summarystats.accept_bytes])
 
     if not Options["No-Action"]: