X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=61e2df05d5bef723b0b7b713b0f9a56d65599c95;hb=0bba8752f2d5aae54f10cf815398b57b046f35e8;hp=8ab693a86e89bbe72c30916ace7916687c01ca75;hpb=6794769445e4dab2f87a87137190b17af739e0c7;p=dak.git diff --git a/daklib/queue.py b/daklib/queue.py index 8ab693a8..61e2df05 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -1214,6 +1214,16 @@ class Upload(object): # We don't have a tagfile, so just don't do anything. return + # Parse the yaml file + sourcefile = file(tagfile, 'r') + sourcecontent = sourcefile.read() + sourcefile.close() + try: + lintiantags = yaml.load(sourcecontent)['lintian'] + except yaml.YAMLError, msg: + utils.fubar("Can not read the lintian tags file %s, YAML error: %s." % (tagfile, msg)) + return + # Try and find all orig mentioned in the .dsc target_dir = '.' symlinked = [] @@ -1281,16 +1291,6 @@ class Upload(object): if symlink_if_valid(queuefile_path): break - # Parse the yaml file - sourcefile = file(tagfile, 'r') - sourcecontent = sourcefile.read() - sourcefile.close() - try: - lintiantags = yaml.load(sourcecontent)['lintian'] - except yaml.YAMLError, msg: - utils.fubar("Can not read the lintian tags file %s, YAML error: %s." % (tagfile, msg)) - return - # Now setup the input file for lintian. lintian wants "one tag per line" only, # so put it together like it. We put all types of tags in one file and then sort # through lintians output later to see if its a fatal tag we detected, or not.