[Mageia-sysadm] [273] only append '@' to the path if it contains '@' or it causes problems for some paths such as '.'

Thu Jan 13 00:55:25 CET 2011

Revision: 273
+Author:   boklm
+Date:     2011-01-13 00:55:25 +0100 (Thu, 13 Jan 2011)
+Log Message:
+-----------
+only append '@' to the path if it contains '@' or it causes problems for some paths such as '.'
+
+Modified Paths:
+--------------
+    build_system/mgarepo/trunk/MgaRepo/svn.py
+
+Modified: build_system/mgarepo/trunk/MgaRepo/svn.py
+===================================================================
+--- build_system/mgarepo/trunk/MgaRepo/svn.py	2011-01-12 12:45:26 UTC (rev 272)
++++ build_system/mgarepo/trunk/MgaRepo/svn.py	2011-01-12 23:55:25 UTC (rev 273)
+@@ -109,24 +109,24 @@
+                 cmd_args.append("-r '%s'" % ret)
+         
+     def add(self, path, **kwargs):
+-        cmd = ["add", path + '@']
++        cmd = ["add", path + '@' if '@' in path else path]
+         return self._execsvn_success(noauth=1, *cmd, **kwargs)
+ 
+     def copy(self, pathfrom, pathto, **kwargs):
+-        cmd = ["copy", pathfrom + '@', pathto + '@']
++        cmd = ["copy", pathfrom + '@' if '@' in pathfrom else pathfrom, pathto + '@' if '@' in pathto else pathto]
+         self._add_revision(cmd, kwargs, optional=1)
+         self._add_log(cmd, kwargs)
+         return self._execsvn_success(*cmd, **kwargs)
+ 
+     def remove(self, path, force=0, **kwargs):
+-        cmd = ["remove", path + '@']
++        cmd = ["remove", path + '@' if '@' in path else path]
+         self._add_log(cmd, kwargs)
+         if force:
+             cmd.append("--force")
+         return self._execsvn_success(*cmd, **kwargs)
+ 
+     def mkdir(self, path, **kwargs):
+-        cmd = ["mkdir", path + '@']
++        cmd = ["mkdir", path + '@' if '@' in path else path]
+         if kwargs.get("parents"):
+             cmd.append("--parents")
+         self._add_log(cmd, kwargs)
+@@ -140,7 +140,7 @@
+             return int(rawrev)
+ 
+     def commit(self, path, **kwargs):
+-        cmd = ["commit", path + '@']
++        cmd = ["commit", path + '@' if '@' in path else path]
+         if kwargs.get("nonrecursive"):
+             cmd.append("-N")
+         self._add_log(cmd, kwargs)
+@@ -181,7 +181,7 @@
+         return self._execsvn_success(local=True, show=True, *cmd, **kwargs)
+ 
+     def revision(self, path, **kwargs):
+-        cmd = ["info", path + '@']
++        cmd = ["info", path + '@' if '@' in path else path]
+         status, output = self._execsvn(local=True, *cmd, **kwargs)
+         if status == 0:
+             for line in output.splitlines():
+@@ -190,7 +190,7 @@
+         return None
+           
+     def info(self, path, **kwargs):
+-        cmd = ["info", path + '@']
++        cmd = ["info", path + '@' if '@' in path else path]
+         status, output = self._execsvn(local=True, noerror=True, *cmd, **kwargs)
+         if "Not a versioned resource" not in output:
+             return output.splitlines()
+@@ -205,14 +205,14 @@
+         return info
+           
+     def ls(self, path, **kwargs):
+-        cmd = ["ls", path + '@']
++        cmd = ["ls", path + '@' if '@' in path else path]
+         status, output = self._execsvn(*cmd, **kwargs)
+         if status == 0:
+             return output.split()
+         return None
+ 
+     def status(self, path, **kwargs):
+-        cmd = ["status", path + '@']
++        cmd = ["status", path + '@' if '@' in path else path]
+         if kwargs.get("verbose"):
+             cmd.append("-v")
+         if kwargs.get("noignore"):
+@@ -225,11 +225,11 @@
+         return None
+ 
+     def cleanup(self, path, **kwargs):
+-        cmd = ["cleanup", path + '@']
++        cmd = ["cleanup", path + '@' if '@' in path else path]
+         return self._execsvn_success(*cmd, **kwargs)
+ 
+     def revert(self, path, **kwargs):
+-        cmd = ["revert", path + '@']
++        cmd = ["revert", path + '@' if '@' in path else path]
+         status, output = self._execsvn(*cmd, **kwargs)
+         if status == 0:
+             return [x.split() for x in output.split()]
+@@ -249,7 +249,7 @@
+         return self._execsvn_success(*cmd, **kwargs)
+ 
+     def update(self, path, **kwargs):
+-        cmd = ["update", path + '@']
++        cmd = ["update", path + '@' if '@' in path else path]
+         self._add_revision(cmd, kwargs, optional=1)
+         status, output = self._execsvn(*cmd, **kwargs)
+         if status == 0:
+-------------- next part --------------
+An HTML attachment was scrubbed...
+URL: </pipermail/mageia-sysadm/attachments/20110113/fafa4030/attachment.html>
+