From: Joerg Jaspert Date: Wed, 25 Feb 2009 22:46:29 +0000 (+0100) Subject: Merge commit 'stew/content_generation' into merge X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=2ae7b715431fed62b6a619e6d1b027d919da1070 Merge commit 'stew/content_generation' into merge * commit 'stew/content_generation': (35 commits) spalling fix, get rid of extra import in utils.py allow contents files to be written to an alternate location another fix to bootstrap, and get rid of 'fetchall' get bootstrap working again stop setting the db connection to latin1 insert files, not dirs cant delete it after i set it to null, dummy use get_suite_architectures from dbconn.py instead of database.py fix misspelling cleanup() -> _cleanup() forgot to update config, get rid of incorrect warning stupid bad merge syntax error better cleanup of temporary files, consolidate some repeated code adding back our schema migration as update6 update header - we always ship compressed contents files temp_content_associations -> pending_content_associations typo fix some spelling changes oops, forgot some changes to contents.py missing ; in dak.conf undoing incorrect changes in dak.conf ... Signed-off-by: Joerg Jaspert --- 2ae7b715431fed62b6a619e6d1b027d919da1070