From: Mike O'Connor <stew@ries.debian.org>
Date: Tue, 10 Nov 2009 16:23:57 +0000 (+0000)
Subject: Merge branch 'master' of /home/stew/src/dak
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=13f7dfde42b50070414e052d795402a89c8c937b;p=dak.git

Merge branch 'master' of /home/stew/src/dak
---

13f7dfde42b50070414e052d795402a89c8c937b
diff --cc dak/process_new.py
index 5381f8dd,ff2c1838..582cf781
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@@ -829,20 -827,16 +828,16 @@@ def move_file_to_queue(to_q, f, session
      # update the changes_pending_files row
      f.queue = to_q
  
-     # actually move the file
-     src = os.path.join(f.queue.path, filename)
-     dest = os.path.join(to_q.path, filename)
-     shutil.move(src, dest)
- 
- @session_wrapper
- def changes_to_unchecked(changes, session=None):
+ def changes_to_unchecked(changes, session):
      """move a changes file to unchecked"""
 -    unchecked = get_queue( 'uncecked' )
 +    unchecked = get_policy_queue('unchecked', session );
      changes.in_queue = unchecked
  
-     for f in changes.files:
+     for f in changes.pkg.files:
          move_file_to_queue(unchecked, f)
  
+     # actually move files
+     changes.move_to_queue(unchecked)
  
  def _accept(upload):
      if Options["No-Action"]: