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

diff --cc dak/process_new.py
index 5381f8ddb6ad8c4d686e5eed1f3224d0df66ab5d,ff2c18388c11037c12b9a0ebcf2e5d510c34065a..582cf781f50b91b2b9fb1cee0f196d80010669f2
--- 1/dak/process_new.py
--- 2/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"]: