]> git.decadent.org.uk Git - dak.git/commitdiff
Merge branch 'merge'
authorJoerg Jaspert <joerg@debian.org>
Wed, 28 Oct 2009 15:30:25 +0000 (16:30 +0100)
committerJoerg Jaspert <joerg@debian.org>
Wed, 28 Oct 2009 15:30:25 +0000 (16:30 +0100)
* 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

1  2 
dak/process_unchecked.py
daklib/queue.py

Simple merge
diff --cc daklib/queue.py
index 1d2a3275fc43ac8f29d062affa974a3f3efc6d6f,0c79a260be58fbe04e1dab92bd0de1d2aae74828..f7d999a3da7220135d89d522ac87948775182199
@@@ -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()