From: Joerg Jaspert Date: Fri, 30 Oct 2009 12:00:04 +0000 (+0100) Subject: Merge commit 'lamby/master' into merge X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=3c6fe9e939ef06d63e364990896472c322f88e02 Merge commit 'lamby/master' into merge * commit 'lamby/master': Remove duplicate return statement. Add missing Config initialiser. Fix do_anaias in cruft-report. Add missing import in contents Add missing configuration initialiser. Fix check_indices_files_exist in check-archive. Fix local variable in check-archive/check_override Fix check_override in check-archive. Don't shadow built-in 'file' Consistently use 4-spaces in add_user.py Don't mix tabs and spaces in add_user.py Signed-off-by: Joerg Jaspert --- 3c6fe9e939ef06d63e364990896472c322f88e02