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

* debian/bin/gencontrol.py: Move changelog processing. 

* debian/lib/python/debian_linux/gencontrol.py:
  Add generic version processing.

svn path=/dists/trunk/linux-2.6/; revision=6420
This commit is contained in:
Bastian Blank 2006-04-14 16:07:56 +00:00
parent f7a57d4ce4
commit 7ba864e429
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/bin/gencontrol.py vendored
View File

@ -8,7 +8,7 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
def __init__(self):
super(gencontrol, self).__init__()
self.changelog = read_changelog()
self.version, self.abiname, self.changelog_vars = self.process_changelog({})
self.version, self.abiname, self.changelog_vars = self.process_changelog()
def do_main_setup(self, vars, makeflags):
vars.update(self.config['image',])
@ -165,6 +165,14 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
makefile.append(("setup-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_setup))
makefile.append(("source-%s-%s-%s-real:" % (arch, subarch, flavour)))
def process_changelog(self):
ret = [None, None, None]
ret[0] = version = self.changelog[0]['Version']
vars = self.process_version(version)
ret[1] = vars['abiname']
ret[2] = vars
return ret
def process_real_image(self, in_entry, depends, vars):
entry = self.process_package(in_entry, vars)
if vars.has_key('desc'):

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

@ -202,22 +202,6 @@ class gencontrol(object):
def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
pass
# TODO: Move away, linux-2.6 specific; unify with modules process_config_version
def process_changelog(self, in_vars):
ret = [None, None, None]
ret[0] = version = self.changelog[0]['Version']
vars = in_vars.copy()
if version['modifier'] is not None:
ret[1] = vars['abiname'] = ''
else:
ret[1] = vars['abiname'] = '-%s' % self.config['abiname',]['abiname']
vars['upstreamversion'] = version['upstream']
vars['version'] = version['version']
vars['source_upstream'] = version['source_upstream']
vars['major'] = version['major']
ret[2] = vars
return ret
def process_relation(self, key, e, in_e, vars):
in_dep = in_e[key]
dep = package_relation_list()
@ -260,6 +244,19 @@ class gencontrol(object):
entries.append(self.process_package(i, vars))
return entries
def process_version(self, version):
vars = {
'upstreamversion': version['upstream'],
'version': version['version'],
'source_upstream': version['source_upstream'],
'major': version['major'],
}
if version['modifier'] is not None:
vars['abiname'] = ''
else:
vars['abiname'] = '-%s' % self.config['abiname',]['abiname']
return vars
def substitute(self, s, vars):
if isinstance(s, (list, tuple)):
for i in xrange(len(s)):