couple of c+p bugs

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/dak/process_new.py b/dak/process_new.py
index 6112186dd58d3a41fdea13905c5a5d214d2d13d2..17cf4e8f0bd1ac810fbb392abe7a6fff5f223b71 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -555,7 +555,7 @@ def do_new(upload, session):
             try:
                 check_daily_lock()
                 done = add_overrides (new, upload, session)
-                new_accept(upload, session)
+                new_accept(upload, Options["No-Action"], session)
                 Logger.log(["NEW ACCEPT: %s" % (upload.pkg.changes_file)])
             except CantGetLockError:
                 print "Hello? Operator! Give me the number for 911!"
@@ -766,7 +766,7 @@ def do_pkg(changes_file, session):
                 else:
                     try:
                         check_daily_lock()
-                        new_accept(u, session)
+                        new_accept(u, Options["No-Action"], session)
                     except CantGetLockError:
                         print "Hello? Operator! Give me the number for 911!"
                         print "Dinstall in the locked area, cant process packages, come back later"

diff --git a/daklib/changesutils.py b/daklib/changesutils.py
index 3f55fc14a2669028a624a4a0a35be0b2b184ebcb..6099b489f50ed204d41ff9b6d6e109b1280d864e 100644 (file)
--- a/daklib/changesutils.py
+++ b/daklib/changesutils.py
@@ -157,16 +157,18 @@ def changes_to_queue(upload, srcqueue, destqueue, session):
         f.queue = destqueue
         utils.move(os.path.join(srcqueue.path, f.filename), destqueue.path, perms=int(destqueue.perms, 8))
 
-    utils.move(os.path.join(new.path, upload.pkg.changes_file), destqueue.path, perms=int(destqueue.perms, 8))
+    utils.move(os.path.join(srcqueue.path, upload.pkg.changes_file), destqueue.path, perms=int(destqueue.perms, 8))
     chg.in_queue = destqueue
     session.commit()
 
 __all__.append('changes_to_queue')
 
-def new_accept(upload, session):
+def new_accept(upload, dry_run, session):
     print "ACCEPT"
-    cnf = Config()
-    if not Options["No-Action"]:
+
+    if not dry_run:
+        cnf = Config()
+
         (summary, short_summary) = upload.build_summaries()
 
         # XXX: mhy: I think this is wrong as these are all attributes on the