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

[Bastian Blank]

Author: waldi
Date: Fri Jan  6 21:40:17 2006
New Revision: 5325

Modified:
   people/waldi/linux-2.6/debian/bin/apply.py
Log:
debian/bin/apply.py
- Don't reference the debian_linux module, it is not available.
- Unlink version file before writing to them.


Modified: people/waldi/linux-2.6/debian/bin/apply.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/apply.py	(original)
+++ people/waldi/linux-2.6/debian/bin/apply.py	Fri Jan  6 21:40:17 2006
@@ -1,8 +1,7 @@
 #!/usr/bin/env python2.4
 
-import os, os.path, sys
+import os, os.path, re, sys
 from warnings import warn
-import debian_linux
 
 _default_home = "@home@"
 _default_revisions = "@revisions@"
@@ -207,13 +206,33 @@
 
     def __init__(self, string = None):
         if string is not None:
-            t = debian_linux.parse_version(string)
-            self.upstream = t['source_upstream']
-            self.revision = t['debian']
+            self.upstream, self.revision = self.parse(string)
 
     def __str__(self):
         return "%s-%s" % (self.upstream, self.revision)
 
+    _re = r"""
+^
+(
+    (?:
+        \d+\.\d+\.\d+\+
+    )?
+    \d+\.\d+\.\d+
+    (?:
+        -.+?
+    )?
+)
+-
+([^-]+)
+$
+"""
+
+    def parse(self, version):
+        match = re.match(self._re, version, re.X)
+        if match is None:
+            raise ValueError
+        return match.groups()
+
 class version_file(object):
     _file = 'version.Debian'
     extra = ()