From: Joerg Jaspert Date: Fri, 25 Mar 2011 13:59:34 +0000 (+0100) Subject: Merge branch 'master' into merge X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=886522194878afe478e4dd61397493f35b5b0e5d;hp=f8ed5b9335b841bd4fca5b43a3b50fbd0f5baba4;p=dak.git Merge branch 'master' into merge * master: (50 commits) Make getArchAll() multithread safe. Try building binary-all for buildd bugfix Write an additional arch all (only) file in generate-filelist. Ignore missing source file in process-new. Create temp directory at the preferred location. 0 pad month and day Update DB pickle file for new table. Put changes files straight into the hashed queue/done dir Don't die on a single error Fix typo Update dinstall for new makemaintainers. Move all files in split_done; we're going to start writing them straight out that way anyways Add logging to make-maintainers. Add missing stuff to make-maintainers. Rewrite make-maintainers from scratch. More fixes for stupid suitesuffix stuff More fixes for suite_suffix Fix up config file Fix up output path for security ... --- diff --git a/daklib/queue.py b/daklib/queue.py index 4ea117b3..b652f844 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -105,7 +105,7 @@ def get_type(f, session): # Determine what parts in a .changes are NEW -def determine_new(filename, changes, files, warn=1, session = None, dsc = None, new = {}): +def determine_new(filename, changes, files, warn=1, session = None, dsc = None, new = None): """ Determine what parts in a C{changes} file are NEW. @@ -134,6 +134,8 @@ def determine_new(filename, changes, files, warn=1, session = None, dsc = None, # TODO: This should all use the database instead of parsing the changes # file again byhand = {} + if new is None: + new = {} dbchg = get_dbchange(filename, session) if dbchg is None: