[Pkg-ocaml-maint-commits] r5864 - /trunk/tools/svn2git/glondu_svn2git.py

[glondu-guest at users.alioth.debian.org]

Author: glondu-guest
Date: Sat Jul 19 20:02:18 2008
New Revision: 5864

URL: http://svn.debian.org/wsvn/?sc=1&rev=5864
Log:
Avoid overlapping variable names

Modified:
    trunk/tools/svn2git/glondu_svn2git.py

Modified: trunk/tools/svn2git/glondu_svn2git.py
URL: http://svn.debian.org/wsvn/trunk/tools/svn2git/glondu_svn2git.py?rev=5864&op=diff
==============================================================================
--- trunk/tools/svn2git/glondu_svn2git.py (original)
+++ trunk/tools/svn2git/glondu_svn2git.py Sat Jul 19 20:02:18 2008
@@ -25,7 +25,7 @@
 svnignore_re = re.compile(r"^/packages/ocaml(|/tags(/.*|))$")
 
 # For extracting tag names
-svntag_re = re.compile(r"^/(packages/ocaml/tags|tags/packages/ocaml)/([^/]+)")
+svntag_path_re = re.compile(r"^/(packages/ocaml/tags|tags/packages/ocaml)/([^/]+)")
 
 # Mapping from alioth login to name and email (could be queried...)
 users_dict = {
@@ -281,7 +281,7 @@
         parent_rev = None
         for (action, file, copyfrom) in self.files:
             if action == "A":
-                m = svntag_re.match(file)
+                m = svntag_path_re.match(file)
                 if m:
                     tag_name = m.group(2)
                 if copyfrom:
@@ -380,7 +380,7 @@
     for (x, y) in opts:
         if x == "-p": package_name = y
         elif x == "-t": tarball_location = y
-        elif x == "-r": initial_revision = y
+        elif x == "-r": initial_revision = int(y)
         elif x == "-x": xml = y
         elif x == "-y": xml_tags = y
         elif x == "-d": dict_mode = True