[kernel] r7821 - dists/trunk/linux-2.6/debian/lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Sun Nov 19 13:13:58 2006
New Revision: 7821

Modified:
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py
Log:
debian/lib/python/debian_linux/debian.py: Support new versioning.


Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py	(original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py	Sun Nov 19 13:13:58 2006
@@ -69,22 +69,17 @@
     version_re = ur"""
 ^
 (?P<source>
-    (?P<parent>
-        \d+\.\d+\.\d+\+
-    )?
-    (?P<upstream>
-        (?P<version>
-            (?P<major>\d+\.\d+)
-            \.
-            \d+
-        )
-        (?:
-            -
-            (?P<modifier>
-                .+?
-            )
-        )?
+    (?P<version>
+        (?P<major>\d+\.\d+)
+        \.
+        \d+
     )
+    (?:
+        ~
+        (?P<modifier>
+            .+?
+        )
+    )?
     -
     (?P<debian>[^-]+)
 )
@@ -94,10 +89,12 @@
     if match is None:
         raise ValueError
     ret = match.groupdict()
-    if ret['parent'] is not None:
-        ret['source_upstream'] = ret['parent'] + ret['upstream']
+    if ret['modifier'] is not None:
+        ret['upstream'] = '%s-%s' % (ret['version'], ret['modifier'])
+        ret['source_upstream'] = '%s~%s' % (ret['version'], ret['modifier'])
     else:
-        ret['source_upstream'] = ret['upstream']
+        ret['upstream'] = ret['version']
+        ret['source_upstream'] = ret['version']
     return ret
 
 class package_description(object):