From: Joerg Jaspert Date: Wed, 28 Oct 2009 15:30:25 +0000 (+0100) Subject: Merge branch 'merge' X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb11aec0c46bae0797a4e32b1d19eb6fcbc07c49;p=dak Merge branch 'merge' * merge: Fix return type. Don't call check_* due when we are running with No-Action While we're at it, split out another version of ensure_orig_files. check_lintian needs all the source, otherwise we can't check the package. Factor out symlink stuff from get_changelog_versions => ensure_all_source_exists --- fb11aec0c46bae0797a4e32b1d19eb6fcbc07c49 diff --cc daklib/queue.py index 1d2a3275,0c79a260..f7d999a3 --- a/daklib/queue.py +++ b/daklib/queue.py @@@ -1207,11 -1222,10 +1222,13 @@@ class Upload(object) if not valid_dist: return + self.ensure_all_source_exists() + cnf = Config() - tagfile = cnf["Dinstall::LintianTags"] + tagfile = cnf.get("Dinstall::LintianTags") + if tagfile is None: + # We don't have a tagfile, so just don't do anything. + return # Parse the yaml file sourcefile = file(tagfile, 'r') sourcecontent = sourcefile.read()