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

* debian/bin/gencontrol.py: Python style update. 

* debian/lib/python/debian_linux/gencontrol.py
  - Python style update.
  - Never process package entry parts in-place.

svn path=/dists/trunk/linux-2.6/; revision=11358
This commit is contained in:
Bastian Blank 2008-05-11 18:53:46 +00:00
parent b74b0fa3dd
commit a85064f716
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/bin/gencontrol.py vendored
View File

@ -167,8 +167,7 @@ class Gencontrol(Base):
image = self.templates["control.image.type-%s" % config_entry_image['type']]
#image = self.templates["control.image.type-modulesinline"]
if not vars.has_key('desc'):
vars['desc'] = None
vars.setdefault('desc', None)
packages_own.append(self.process_real_image(image[0], image_relations, config_entry_relations, vars))
packages_own.extend(self.process_packages(image[1:], vars))

32
debian/lib/python/debian_linux/gencontrol.py vendored
View File

@ -240,43 +240,41 @@ class Gencontrol(object):
def do_flavour_packages(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
pass
def process_relation(self, key, e, in_e, vars):
def process_relation(self, dep, vars):
import copy
dep = copy.deepcopy(in_e[key])
dep = copy.deepcopy(dep)
for groups in dep:
for item in groups:
item.name = self.substitute(item.name, vars)
e[key] = dep
return dep
def process_description(self, e, in_e, vars):
in_desc = in_e['Description']
def process_description(self, in_desc, vars):
desc = in_desc.__class__()
desc.short = self.substitute(in_desc.short, vars)
for i in in_desc.long:
desc.append(self.substitute(i, vars))
e['Description'] = desc
return desc
def process_package(self, in_entry, vars):
e = Package()
entry = in_entry.__class__()
for key, value in in_entry.iteritems():
if isinstance(value, PackageRelation):
self.process_relation(key, e, in_entry, vars)
elif key == 'Description':
self.process_description(e, in_entry, vars)
elif key[:2] == 'X-':
pass
value = self.process_relation(value, vars)
elif isinstance(value, PackageDescription):
value = self.process_description(value, vars)
elif key.startswith('X-'):
continue
else:
e[key] = self.substitute(value, vars)
return e
value = self.substitute(value, vars)
entry[key] = value
return entry
def process_packages(self, entries, vars):
return [self.process_package(i, vars) for i in entries]
def substitute(self, s, vars):
if isinstance(s, (list, tuple)):
for i in xrange(len(s)):
s[i] = self.substitute(s[i], vars)
return s
return [self.substitute(i, vars) for i in s]
def subst(match):
return vars[match.group(1)]
return re.sub(r'@([-_a-z]+)@', subst, s)