X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Farchive.py;h=2c25e1007dfccaa320e8812a70cecc4e805cfe2b;hb=78eeea4f01480933a4081a03653b4210f2a3cf32;hp=dd4a22ca3c376a6a890ad344e87823e13ea108ac;hpb=a4e40115e7b82033b5fcbf9482b95811bc823eec;p=dak.git

diff --git a/daklib/archive.py b/daklib/archive.py
index dd4a22ca..2c25e100 100644
--- a/daklib/archive.py
+++ b/daklib/archive.py
@@ -335,6 +335,8 @@ class ArchiveTransaction(object):
         db_source.suites.append(suite)
 
         if not created:
+            for f in db_source.srcfiles:
+                self._copy_file(f.poolfile, archive, component, allow_tainted=allow_tainted)
             return db_source
 
         ### Now add remaining files and copy them to the archive.
@@ -803,8 +805,12 @@ class ArchiveUpload(object):
         if suite.overridesuite is not None:
             suite = self.session.query(Suite).filter_by(suite_name=suite.overridesuite).one()
 
+        mapped_component = get_mapped_component(binary.component)
+        if mapped_component is None:
+            return None
+
         query = self.session.query(Override).filter_by(suite=suite, package=binary.control['Package']) \
-                .join(Component).filter(Component.component_name == binary.component) \
+                .join(Component).filter(Component.component_name == mapped_component.component_name) \
                 .join(OverrideType).filter(OverrideType.overridetype == binary.type)
 
         try: