X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=31f9a25be9e48e5f34ea59d3d6743f539338825e;hb=79460bdd311aa81d0cd6be7393ec95df49b0ec0b;hp=03b5e6b9f7453a0206ee79d5a31693e6fe2e2095;hpb=382f9d5d611d17c1ffa1fd5e729e811dde4f347e;p=dak.git diff --git a/daklib/queue.py b/daklib/queue.py index 03b5e6b9..31f9a25b 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -1025,7 +1025,7 @@ class Upload(object): ########################################################################### - def ensure_all_source_exists(self, dest_dir=None): + 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. @@ -1045,10 +1045,10 @@ class Upload(object): if not os.path.exists(src): return ftype = m.group(3) - if re_is_orig_source.match(f) and pkg.orig_files.has_key(f) and \ - pkg.orig_files[f].has_key("path"): + 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(os.getcwd(), f) + dest = os.path.join(dest_dir, f) os.symlink(src, dest) # If the orig files are not a part of the upload, create symlinks to the @@ -1077,7 +1077,7 @@ class Upload(object): if not dsc_filename: return - self.ensure_all_source_exists() + self.ensure_all_source_exists(source_dir) # Extract the source cmd = "dpkg-source -sn -x %s" % (dsc_filename)