[kernel] r4782 - dists/trunk/linux-2.6/debian/bin

[Sven Luther]

Author: luther
Date: Thu Nov 10 08:35:02 2005
New Revision: 4782

Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
Log:
Conflicts where not handled by gencontrol.py, added.


Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Thu Nov 10 08:35:02 2005
@@ -162,7 +162,7 @@
 def process_package(in_entry, vars):
     e = entry()
     for i in in_entry.iterkeys():
-        if i in (('Depends', 'Provides', 'Suggests', 'Recommends')):
+        if i in (('Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts')):
             process_depends(i, e, in_entry, vars)
         elif i == 'Description':
             process_description(e, in_entry, vars)
@@ -183,7 +183,7 @@
     if vars.has_key('desc'):
         in_entry['Description'] += "\n.\n" + vars['desc']
     entry = process_package(in_entry, vars)
-    for i in (('Depends', 'Provides', 'Suggests', 'Recommends')):
+    for i in (('Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts')):
         value = []
         tmp = entry.get(i, None)
         if tmp:
@@ -206,6 +206,10 @@
             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)
     return entry