debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

debian/bin/gencontrol.py: Cleanup generation of image relations. 

svn path=/dists/trunk/linux-2.6/; revision=11360
This commit is contained in:
Bastian Blank 2008-05-11 19:12:37 +00:00
parent 752a054a81
commit ce80d13f7d
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
debian/bin/gencontrol.py vendored
View File

@ -125,10 +125,10 @@ class Gencontrol(Base):
item.arches = [arch] item.arches = [arch]
packages['source']['Build-Depends'].extend(relations_compiler_build_dep) packages['source']['Build-Depends'].extend(relations_compiler_build_dep)
image_relations = { image_relations = {}
'conflicts': PackageRelation(), for field in 'depends', 'provides', 'suggests', 'recommends', 'conflicts':
'depends': PackageRelation(), image_relations[field] = PackageRelation(config_entry_image.get(field, None))
}
if vars.get('initramfs', True): if vars.get('initramfs', True):
generators = config_entry_image['initramfs-generators'] generators = config_entry_image['initramfs-generators']
config_entry_commands_initramfs = self.config.merge('commands-image-initramfs-generators', arch, featureset, flavour) config_entry_commands_initramfs = self.config.merge('commands-image-initramfs-generators', arch, featureset, flavour)
@ -169,7 +169,7 @@ class Gencontrol(Base):
vars.setdefault('desc', None) vars.setdefault('desc', None)
packages_own.append(self.process_real_image(image[0], image_relations, config_entry_relations, vars)) packages_own.append(self.process_real_image(image[0], image_relations, vars))
packages_own.extend(self.process_packages(image[1:], vars)) packages_own.extend(self.process_packages(image[1:], vars))
if build_modules: if build_modules:
@ -281,14 +281,11 @@ class Gencontrol(Base):
} }
self.config['version',] = {'source': self.version.complete, 'abiname': self.abiname} self.config['version',] = {'source': self.version.complete, 'abiname': self.abiname}
def process_real_image(self, in_entry, relations, config, vars): def process_real_image(self, in_entry, relations, vars):
entry = self.process_package(in_entry, vars) entry = self.process_package(in_entry, vars)
for field in 'Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts': for field in 'Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts':
value = entry.get(field, PackageRelation()) value = entry.get(field, PackageRelation())
t = vars.get(field.lower(), []) value.extend(relations.get(field.lower(), []))
value.extend(t)
t = relations.get(field.lower(), [])
value.extend(t)
if value: if value:
entry[field] = value entry[field] = value
return entry return entry