[kernel] r12494 - dists/sid/linux-latest-2.6/debian/bin

[Bastian Blank]

Author: waldi
Date: Wed Dec 10 12:23:13 2008
New Revision: 12494

Log:
debian/bin/gencontrol.py: Use all description parts.


Modified:
   dists/sid/linux-latest-2.6/debian/bin/gencontrol.py

Modified: dists/sid/linux-latest-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-latest-2.6/debian/bin/gencontrol.py	(original)
+++ dists/sid/linux-latest-2.6/debian/bin/gencontrol.py	Wed Dec 10 12:23:13 2008
@@ -46,10 +46,10 @@
 
         image_fields = {'Description': PackageDescription()}
 
-        if 'desc-parts' in config_image:
+        desc_parts = self.config.get_merge('image', arch, featureset, flavour, 'desc-parts')
+        if desc_parts:
             desc = image_fields['Description']
-            parts = config_image['desc-parts']
-            for part in parts:
+            for part in desc_parts[::-1]:
                 desc.append(config_image['desc-long-part-' + part])
                 desc.append_short(config_image.get('desc-short-part-' + part, ''))