From b6bb30a3f568bf5b2f899e4256dc43e5367bb53d Mon Sep 17 00:00:00 2001 From: Mike O'Connor Date: Sat, 14 Nov 2009 16:05:25 +0000 Subject: [PATCH] maybe working? Signed-off-by: Mike O'Connor --- dak/process_new.py | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dak/process_new.py b/dak/process_new.py index dfd654c9..1c69fd9e 100755 --- a/dak/process_new.py +++ b/dak/process_new.py @@ -816,8 +816,25 @@ def lock_package(package): finally: os.unlink(path) +class clean_holding(object): + def __init__(self,pkg): + self.pkg = pkg + + def __enter__(self): + pass + + def __exit__(self, type, value, traceback): + h = Holding() + + for f in self.pkg.files.keys(): + if os.path.exists(os.path.join(h.holding_dir, f)): + os.unlink(os.path.join(h.holding_dir, f)) + + + def changes_to_newstage(upload, session): """move a changes file to newstage""" + new = get_policy_queue('new', session ); newstage = get_policy_queue('newstage', session ); # changes.in_queue = newstage @@ -828,9 +845,10 @@ def changes_to_newstage(upload, session): for f in chg.files: # update the changes_pending_files row f.queue = newstage + utils.move(os.path.join(new.path, f.filename), newstage.path, perms=int(newstage.perms, 8)) - # actually move files - upload.move_to_queue(newstage) + utils.move(os.path.join(new.path, upload.pkg.changes_file), newstage.path, perms=int(newstage.perms, 8)) + chg.in_queue = newstage def _accept(upload, session): if Options["No-Action"]: @@ -887,8 +905,9 @@ def do_pkg(changes_file, session): try: with lock_package(u.pkg.changes["source"]): - if not recheck(u, session): - return + with clean_holding(u.pkg): + if not recheck(u, session): + return # FIXME: This does need byhand checks added! new = determine_new(u.pkg.changes, files) -- 2.39.5