[kernel] r11913 - dists/trunk/linux-2.6/debian/lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Sat Jul 26 21:40:08 2008
New Revision: 11913

Log:
debian/lib/python/debian_linux/gencontrol.py: Fix longclass usage.


Modified:
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py

Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Sat Jul 26 21:40:08 2008
@@ -208,10 +208,7 @@
         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