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

Move initial abiname handling into special code.

svn path=/dists/trunk/linux-2.6/; revision=6422
This commit is contained in:
Bastian Blank 2006-04-14 16:17:39 +00:00
parent 063add3983
commit 287444d150
2 changed files with 4 additions and 4 deletions

View File

@ -168,6 +168,10 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
def process_changelog(self):
version = self.changelog[0]['Version']
self.changelog_vars = self.process_version(version)
if version['modifier'] is not None:
self.abiname = self.changelog_vars['abiname'] = ''
else:
self.abiname = self.changelog_vars['abiname'] = '-%s' % self.config['abiname',]['abiname']
def process_real_image(self, in_entry, depends, vars):
entry = self.process_package(in_entry, vars)

View File

@ -252,10 +252,6 @@ class gencontrol(object):
'source_upstream': version['source_upstream'],
'major': version['major'],
}
if version['modifier'] is not None:
self.abiname = vars['abiname'] = ''
else:
self.abiname = vars['abiname'] = '-%s' % self.config['abiname',]['abiname']
return vars
def substitute(self, s, vars):