Debug packages should not go to NEW even for binary-only uploads

[dak.git] / daklib / archive.py

diff --git a/daklib/archive.py b/daklib/archive.py
index 7dd1822ad3abc8c20ed47a12c76927986c9abd30..010fbf7eba5814f914b525abd5b7788d97096415 100644 (file)
--- a/daklib/archive.py
+++ b/daklib/archive.py
@@ -788,6 +788,8 @@ class ArchiveUpload(object):
             binaries = [ entry for entry in packages ]
 
         for b in binaries:
+            if utils.is_in_debug_section(b.control) and suite.debug_suite is not None:
+                continue
             override = self._binary_override(suite, b)
             if override is None:
                 self.warnings.append('binary:{0} is NEW.'.format(b.name))
@@ -1170,7 +1172,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 +1274,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])