X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Farchive.py;h=50a568a5b650cc5c85baa230fcdb3dbaf642da9f;hb=b5fce56d397a377819dc3ff5962ad7acf366398d;hp=7dd1822ad3abc8c20ed47a12c76927986c9abd30;hpb=e715ad85d02e1803c7a8a299a241cae4047b24fd;p=dak.git diff --git a/daklib/archive.py b/daklib/archive.py index 7dd1822a..50a568a5 100644 --- a/daklib/archive.py +++ b/daklib/archive.py @@ -1170,7 +1170,7 @@ class ArchiveUpload(object): continue script = rule['Script'] - retcode = daklib.daksubprocess.call([script, os.path.join(self.directory, f.filename), control['Version'], arch, os.path.join(self.directory, self.changes.filename)], shell=False) + retcode = daklib.daksubprocess.call([script, os.path.join(self.directory, f.filename), control['Version'], arch, os.path.join(self.directory, self.changes.filename), suite.suite_name], shell=False) if retcode != 0: print "W: error processing {0}.".format(f.filename) remaining.append(f) @@ -1272,7 +1272,7 @@ class ArchiveUpload(object): source_suites = self.session.query(Suite).filter(Suite.suite_id.in_(source_suite_ids)).subquery() source_component_func = lambda source: self._source_override(overridesuite, source).component - binary_component_func = lambda binary: self._binary_component(overridesuite, binary) + binary_component_func = lambda binary: self._binary_component(overridesuite, binary, only_overrides=False) (db_source, db_binaries) = self._install_to_suite(redirected_suite, source_component_func, binary_component_func, source_suites=source_suites, extra_source_archives=[suite.archive])