From efce802a6ec81a0c9fa877cd6bd213b1db40fd23 Mon Sep 17 00:00:00 2001 From: Chris Lamb Date: Thu, 29 Oct 2009 09:31:26 +0000 Subject: [PATCH] Inline ensure_all_source_exists. Signed-off-by: Chris Lamb --- daklib/queue.py | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/daklib/queue.py b/daklib/queue.py index 31f9a25b..a18af981 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -1025,16 +1025,21 @@ class Upload(object): ########################################################################### - def ensure_all_source_exists(self, source_dir, dest_dir=None): - """ - Ensure that dest_dir contains all the orig tarballs for the specified - changes. If it does not, symlink them into place. + def get_changelog_versions(self, source_dir): + """Extracts a the source package and (optionally) grabs the + version history out of debian/changelog for the BTS.""" - If dest_dir is None, populate the current directory. - """ + cnf = Config() - if dest_dir is None: - dest_dir = os.getcwd() + # Find the .dsc (again) + dsc_filename = None + for f in self.pkg.files.keys(): + if self.pkg.files[f]["type"] == "dsc": + dsc_filename = f + + # If there isn't one, we have nothing to do. (We have reject()ed the upload already) + if not dsc_filename: + return # Create a symlink mirror of the source files in our temporary directory for f in self.pkg.files.keys(): @@ -1048,7 +1053,7 @@ class Upload(object): if re_is_orig_source.match(f) and self.pkg.orig_files.has_key(f) and \ self.pkg.orig_files[f].has_key("path"): continue - dest = os.path.join(dest_dir, f) + dest = os.path.join(os.getcwd(), f) os.symlink(src, dest) # If the orig files are not a part of the upload, create symlinks to the @@ -1059,26 +1064,6 @@ class Upload(object): dest = os.path.join(os.getcwd(), os.path.basename(orig_file)) os.symlink(self.pkg.orig_files[orig_file]["path"], dest) - ########################################################################### - - def get_changelog_versions(self, source_dir): - """Extracts a the source package and (optionally) grabs the - version history out of debian/changelog for the BTS.""" - - cnf = Config() - - # Find the .dsc (again) - dsc_filename = None - for f in self.pkg.files.keys(): - if self.pkg.files[f]["type"] == "dsc": - dsc_filename = f - - # If there isn't one, we have nothing to do. (We have reject()ed the upload already) - if not dsc_filename: - return - - self.ensure_all_source_exists(source_dir) - # Extract the source cmd = "dpkg-source -sn -x %s" % (dsc_filename) (result, output) = commands.getstatusoutput(cmd) -- 2.39.5