r3794 - people/waldi/kernel/source/linux-2.6/debian/bin

[Bastian Blank]

Author: waldi
Date: 2005-08-09 21:43:07 +0000 (Tue, 09 Aug 2005)
New Revision: 3794

Modified:
   people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
Log:
debian/bin/gencontrol.py: Updates.


Modified: people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-09 19:57:44 UTC (rev 3793)
+++ people/waldi/kernel/source/linux-2.6/debian/bin/gencontrol.py	2005-08-09 21:43:07 UTC (rev 3794)
@@ -143,8 +143,8 @@
     return read_rfc822(file("debian/templates/control.%s.in" % name))
 
 def parse_version(version):
-    match = re.match("^((\d+\.\d+)\..+?)-([^-]+)$", version)
-    return (match.group(0), match.group(1), match.group(2), match.group(3))
+    match = re.match("^(?P<source>(?P<version>(?P<major>\d+\.\d+)\..+?)-(?P<debian>[^-]+))$", version)
+    return match.groupdict()
 
 def process_depends(key, e, in_e, vars):
     in_dep = in_e[key].split(',')
@@ -188,6 +188,9 @@
     return entries
 
 def process_real_image(in_entry, vars):
+    in_entry = in_entry.copy()
+    if vars.has_key('desc'):
+        in_entry['Description'] += "\n.\n" + vars['desc']
     entry = process_package(in_entry, vars)
     for i in (('Depends', 'Provides', 'Suggests')):
         value = []
@@ -209,8 +212,6 @@
             if t is not None:
                 value.append(t)
         entry[i] = ', '.join(value)
-    if vars.has_key('desc'):
-        entry['Description'] += "\n.\n" + vars['desc']
     return entry
 
 def process_real_tree(in_entry, changelog, vars):
@@ -225,19 +226,11 @@
         value = []
         tmp = entry.get(i, None)
         if tmp:
-            tmp = tmp.split(',')
-            for t in tmp:
-                value.append(t.strip())
+            value.extend([j.strip() for j in tmp.split(',')])
         if i == 'Depends':
-            tmp = []
-            for v in versions:
-                v = parse_version(v)
-                tmp.append("linux-source-%s (= %s)" % (v[1], v[0]))
-            value.append(' | '.join(tmp))
+            value.append(' | '.join(["linux-source-%(version)s (= %(source)s)" % parse_version(v) for v in versions]))
         elif i == 'Provides':
-            for v in versions:
-                v = parse_version(v)
-                value.append("linux-tree-%s" % v[0])
+            value.extend(["linux-tree-%(source)s" % parse_version(v) for v in versions])
         entry[i] = ', '.join(value)
     return entry
 
@@ -248,9 +241,9 @@
 
 def vars_changelog(vars, changelog):
     version = parse_version(changelog[0]['Version'])
-    vars['srcver'] = version[0]
-    vars['version'] = version[1]
-    vars['major'] = version[2]
+    vars['srcver'] = version['source']
+    vars['version'] = version['version']
+    vars['major'] = version['major']
     return vars
 
 def write_control(list):