From f298d464c46ffab369d8afdb428c203456a6d63c Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sat, 26 Jul 2008 21:40:08 +0000 Subject: [PATCH] debian/lib/python/debian_linux/gencontrol.py: Fix longclass usage. svn path=/dists/trunk/linux-2.6/; revision=11913 --- debian/lib/python/debian_linux/gencontrol.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py index 91f45b429..8b11d3d6a 100644 --- a/debian/lib/python/debian_linux/gencontrol.py +++ b/debian/lib/python/debian_linux/gencontrol.py @@ -208,10 +208,7 @@ class Gencontrol(object): config_base = self.config.merge('base', arch, featureset, flavour) vars['class'] = config_base['class'] - if not vars.has_key('longclass'): -# from warnings import warn -# warn("Image lacks longclass setting: %s, %s, %s" % (arch, featureset, flavour), UserWarning, stacklevel = 1) - vars['longclass'] = vars['class'] + vars['longclass'] = config_base.get('longclass') or vars['class'] vars['localversion'] += '-' + flavour