From 287444d150bf026cb23ea504b541aed307f6db98 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 14 Apr 2006 16:17:39 +0000 Subject: [PATCH] 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 --- debian/bin/gencontrol.py | 4 ++++ debian/lib/python/debian_linux/gencontrol.py | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 7d708dd5e..549141d2d 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -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) diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py index 8d3b35d2f..0aa30de99 100644 --- a/debian/lib/python/debian_linux/gencontrol.py +++ b/debian/lib/python/debian_linux/gencontrol.py @@ -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):