r4028 - people/waldi/kernel/linux-2.6/debian/bin

[Bastian Blank]

Author: waldi
Date: 2005-08-23 16:04:56 +0000 (Tue, 23 Aug 2005)
New Revision: 4028

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


Modified: people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-23 15:17:44 UTC (rev 4027)
+++ people/waldi/kernel/linux-2.6/debian/bin/gencontrol.py	2005-08-23 16:04:56 UTC (rev 4028)
@@ -103,6 +103,21 @@
     match = re.match(version_re, version, re.X)
     return match.groupdict()
 
+def process_changelog(in_vars, changelog):
+    ret = [None, None, None, None]
+    ret[0] = version = changelog[0]['Version']
+    vars = in_vars.copy()
+    if version['modifier'] is not None:
+        ret[1] = vars['abiname'] = version['modifier']
+        ret[2] = ""
+    else:
+        ret[1] = vars['abiname'] = c['base']['abiname']
+        ret[2] = "-%s" % vars['abiname']
+    vars['version'] = version['version']
+    vars['major'] = version['major']
+    ret[3] = vars
+    return ret
+
 def process_depends(key, e, in_e, vars):
     in_dep = in_e[key].split(',')
     dep = []
@@ -197,12 +212,6 @@
         return vars[match.group(1)]
     return re.sub(r'@([a-z_]+)@', subst, s)
 
-def vars_changelog(vars, changelog):
-    version = changelog[0]['Version']
-    vars['version'] = version['version']
-    vars['major'] = version['major']
-    return vars
-
 def write_control(list):
     write_rfc822(file("debian/control", 'w'), list)
 
@@ -228,21 +237,13 @@
 def main():
     changelog = read_changelog()
 
+    c = config()
+
     vars = {}
-    vars = vars_changelog(vars, changelog)
 
-    c = config()
-
     vars.update(c['base'])
 
-    version = changelog[0]['Version']
-    if version['modifier'] is not None:
-        abiname = version['modifier']
-        kpkg_abiname = ""
-        vars['abiname'] = abiname
-    else:
-        abiname = c['base']['abiname']
-        kpkg_abiname = "-%s" % abiname
+    version, abiname, kpkg_abiname, vars = process_changelog(vars, changelog)
 
     arches = {}
     subarches_architecture = {}