[kernel] r4812 - people/waldi/linux-2.6/debian/bin

[Bastian Blank]

Author: waldi
Date: Sun Nov 13 16:36:38 2005
New Revision: 4812

Modified:
   people/waldi/linux-2.6/debian/bin/gencontrol.py
Log:
debian/bin/gencontrol.py: Update.


Modified: people/waldi/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/bin/gencontrol.py	Sun Nov 13 16:36:38 2005
@@ -124,34 +124,17 @@
         if vars.has_key('desc'):
             in_entry['Description'] += "\n.\n" + vars['desc']
         entry = self.process_package(in_entry, vars)
-        for i in (('Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts')):
+        for field in (('Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts')):
             value = []
-            tmp = entry.get(i, None)
+            tmp = entry.get(field, None)
             if tmp:
                 tmp = tmp.split(',')
                 for t in tmp:
                     value.append(t.strip())
-            if i == 'Depends':
-                t = vars.get('depends', None)
-                if t is not None:
-                    value.append(t)
-            elif i == 'Provides':
-                t = vars.get('provides', None)
-                if t is not None:
-                    value.append(t)
-            elif i == 'Suggests':
-                t = vars.get('suggests', None)
-                if t is not None:
-                    value.append(t)
-            elif i == 'Recommends':
-                t = vars.get('recommends', None)
-                if t is not None:
-                    value.append(t)
-            elif i == 'Conflicts':
-                t = vars.get('conflicts', None)
-                if t is not None:
-                    value.append(t)
-            entry[i] = ', '.join(value)
+            t = vars.get(field.lower(), None)
+            if t is not None:
+                value.append(t)
+            entry[field] = ', '.join(value)
         return entry
 
     def process_real_tree(self, in_entry, vars):