"""module to process policy queue uploads"""
from .config import Config
-from .dbconn import BinaryMetadata, Component, MetadataKey, Override, OverrideType, Suite, get_mapped_component
+from .dbconn import BinaryMetadata, Component, MetadataKey, Override, OverrideType, Suite, get_mapped_component, get_mapped_component_name
from .fstransactions import FilesystemTransaction
from .regexes import re_file_changes, re_file_safe
+from .packagelist import PackageList
import daklib.utils as utils
import errno
for byhand in self.upload.byhand:
src = os.path.join(queue.path, byhand.filename)
dst = os.path.join(directory, byhand.filename)
- if not os.path.exists(dst) or not ignore_existing:
+ if os.path.exists(src) and (not os.path.exists(dst) or not ignore_existing):
fs.copy(src, dst, mode=mode, symlink=symlink)
# copy .changes
.filter(Override.component == component)
return query.first()
- def _binary_override(self, binary, component_name):
- package = binary.package
+ def _binary_override(self, name, binarytype, component_name):
suite = self._overridesuite
- overridetype = binary.binarytype
component = get_mapped_component(component_name, self.session)
- query = self.session.query(Override).filter_by(package=package, suite=suite) \
- .join(OverrideType).filter(OverrideType.overridetype == overridetype) \
+ query = self.session.query(Override).filter_by(package=name, suite=suite) \
+ .join(OverrideType).filter(OverrideType.overridetype == binarytype) \
.filter(Override.component == component)
return query.first()
- def _binary_metadata(self, binary, key):
- metadata_key = self.session.query(MetadataKey).filter_by(key=key).first()
- if metadata_key is None:
- return None
- metadata = self.session.query(BinaryMetadata).filter_by(binary=binary, key=metadata_key).first()
- if metadata is None:
- return None
- return metadata.value
-
@property
def _changes_prefix(self):
changesname = self.upload.changes.changesname
missing = []
components = set()
+ source = self.upload.source
+
if hints is None:
hints = []
hints_map = dict([ ((o['type'], o['package']), o) for o in hints ])
- for binary in self.upload.binaries:
- priority = self._binary_metadata(binary, 'Priority')
- section = self._binary_metadata(binary, 'Section')
+ def check_override(name, type, priority, section, included):
component = 'main'
if section.find('/') != -1:
component = section.split('/', 1)[0]
- override = self._binary_override(binary, component)
- if override is None and not any(o['package'] == binary.package and o['type'] == binary.binarytype for o in missing):
- hint = hints_map.get((binary.binarytype, binary.package))
+ override = self._binary_override(name, type, component)
+ if override is None and not any(o['package'] == name and o['type'] == type for o in missing):
+ hint = hints_map.get((type, name))
if hint is not None:
missing.append(hint)
component = hint['component']
else:
missing.append(dict(
- package = binary.package,
+ package = name,
priority = priority,
section = section,
component = component,
- type = binary.binarytype,
+ type = type,
+ included = included
))
components.add(component)
- source = self.upload.source
- source_component = '(unknown)'
- for component, in self.session.query(Component.component_name).order_by(Component.ordering):
- if component in components:
- source_component = component
- break
- else:
- if source is not None:
- if self._source_override(component) is not None:
- source_component = component
- break
+ for binary in self.upload.binaries:
+ binary_proxy = binary.proxy
+ priority = binary_proxy['Priority']
+ section = binary_proxy['Section']
+ check_override(binary.package, binary.binarytype, priority, section, included=True)
if source is not None:
+ source_proxy = source.proxy
+ package_list = PackageList(source_proxy)
+ if not package_list.fallback:
+ packages = package_list.packages_for_suite(self.upload.target_suite)
+ for p in packages:
+ check_override(p.name, p.type, p.priority, p.section, included=False)
+
+ # see daklib.archive.source_component_from_package_list
+ # which we cannot use here as we might not have a Package-List
+ # field for old packages
+ mapped_components = [ get_mapped_component_name(c) for c in components ]
+ query = self.session.query(Component).order_by(Component.ordering) \
+ .filter(Component.component_name.in_(mapped_components))
+ source_component = query.first().component_name
+
override = self._source_override(source_component)
if override is None:
hint = hints_map.get(('dsc', source.source))
missing.append(hint)
else:
section = 'misc'
- if component != 'main':
- section = "{0}/{1}".format(component, section)
+ if source_component != 'main':
+ section = "{0}/{1}".format(source_component, section)
missing.append(dict(
package = source.source,
priority = 'extra',
section = section,
component = source_component,
type = 'dsc',
+ included = True,
))
return missing
projects / dak.git / blobdiff