From: Chris Lamb Date: Thu, 29 Oct 2009 11:28:23 +0000 (+0000) Subject: Look in the pool and queues for missing orig files. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab3c9d14312a8b49e28e501c67800b7fcf59a442;p=dak Look in the pool and queues for missing orig files. Signed-off-by: Chris Lamb --- diff --git a/daklib/queue.py b/daklib/queue.py index d6267399..9c12d1e2 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -1197,6 +1197,8 @@ class Upload(object): ########################################################################### def check_lintian(self): + cnf = Config() + # Only check some distributions valid_dist = False for dist in ('unstable', 'experimental'): @@ -1207,9 +1209,65 @@ class Upload(object): if not valid_dist: return - self.ensure_all_source_exists() + # Try and find all orig mentioned in the .dsc + target_dir = '.' + for filename, entry in self.pkg.dsc_files.iteritems(): + if re_is_orig_source.match(filename): + # File is not an orig; ignore + continue + + if os.path.exists(filename): + # File exists, no need to continue + continue + + def symlink_if_valid(path): + f = utils.open_file(path) + md5sum = apt_pkg.md5sum(f) + f.close() + + fingerprint = (os.stat(path)[stat.ST_SIZE], md5sum) + expected = (int(entry['size']), entry['md5sum']) + + if fingerprint != expected: + return False + + os.symlink(path, os.path.join(target_dir, filename)) + return True + + found = False + + # Look in the pool + for poolfile in get_poolfile_like_name('/%s' % filename): + poolfile_path = os.path.join( + poolfile.location.path, poolfile.filename + ) + + if symlink_if_valid(poolfile_path): + found = True + break + + if found: + continue + + # Look in some other queues for the file + queues = ('Accepted', 'New', 'Byhand', 'ProposedUpdates', + 'OldProposedUpdates', 'Embargoed', 'Unembargoed') + + for queue in queues: + if 'Dir::Queue::%s' % directory not in cnf: + continue + + queuefile_path = os.path.join( + cnf['Dir::Queue::%s' % directory], filename + ) + + if not os.path.exists(queuefile_path): + # Does not exist in this queue + continue + + if symlink_if_valid(queuefile_path): + break - cnf = Config() tagfile = cnf.get("Dinstall::LintianTags") if tagfile is None: # We don't have a tagfile, so just don't do anything.