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

debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py: 

Set variables directly.

svn path=/dists/trunk/linux-2.6/; revision=6421
This commit is contained in:
Bastian Blank 2006-04-14 16:12:41 +00:00
parent 7ba864e429
commit 063add3983
2 changed files with 6 additions and 9 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.process_changelog()
def do_main_setup(self, vars, makeflags):
vars.update(self.config['image',])
@ -166,12 +166,8 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
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
version = self.changelog[0]['Version']
self.changelog_vars = self.process_version(version)
def process_real_image(self, in_entry, depends, vars):
entry = self.process_package(in_entry, vars)

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

@ -245,6 +245,7 @@ class gencontrol(object):
return entries
def process_version(self, version):
self.version = version
vars = {
'upstreamversion': version['upstream'],
'version': version['version'],
@ -252,9 +253,9 @@ class gencontrol(object):
'major': version['major'],
}
if version['modifier'] is not None:
vars['abiname'] = ''
self.abiname = vars['abiname'] = ''
else:
vars['abiname'] = '-%s' % self.config['abiname',]['abiname']
self.abiname = vars['abiname'] = '-%s' % self.config['abiname',]['abiname']
return vars
def substitute(self, s, vars):