[Zope-CVS] SVN: zpkgtools/trunk/zpkgtools/ try to make quoting on command lines more Windows-friendly

Fred L. Drake, Jr. fdrake at gmail.com
Wed Aug 10 17:29:26 EDT 2005


Log message for revision 37850:
  try to make quoting on command lines more Windows-friendly

Changed:
  U   zpkgtools/trunk/zpkgtools/cvsloader.py
  U   zpkgtools/trunk/zpkgtools/svnloader.py

-=-
Modified: zpkgtools/trunk/zpkgtools/cvsloader.py
===================================================================
--- zpkgtools/trunk/zpkgtools/cvsloader.py	2005-08-10 20:33:30 UTC (rev 37849)
+++ zpkgtools/trunk/zpkgtools/cvsloader.py	2005-08-10 21:29:25 UTC (rev 37850)
@@ -387,6 +387,6 @@
     # separate this out to ease testing
 
     def openCvsRLog(self, cvsroot, path):
-        cmd = "cvs -f -q -d '%s' rlog -R -l '%s'" % (cvsroot, path)
+        cmd = 'cvs -f -q -d "%s" rlog -R -l "%s"' % (cvsroot, path)
         runlog.report_command(cmd)
         return os.popen(cmd, "r")

Modified: zpkgtools/trunk/zpkgtools/svnloader.py
===================================================================
--- zpkgtools/trunk/zpkgtools/svnloader.py	2005-08-10 20:33:30 UTC (rev 37849)
+++ zpkgtools/trunk/zpkgtools/svnloader.py	2005-08-10 21:29:25 UTC (rev 37850)
@@ -314,7 +314,7 @@
 
         """
         # do an "svn cat" to get a file, or learn that this is a directory
-        cmd = "svn cat '%s'" % url
+        cmd = 'svn cat "%s"' % url
         runlog.report_command(cmd)
         stdin, stdout, stderr = os.popen3(cmd)
         data = stdout.read()
@@ -324,7 +324,7 @@
             if "directory" in err:
                 # it is!
                 target = os.path.join(workdir, "foo")
-                cmd = "svn export -q '%s' '%s'" % (url, target)
+                cmd = 'svn export -q "%s" "%s"' % (url, target)
                 runlog.report_command(cmd)
                 rc = os.system(cmd)
                 runlog.report_exit_code(rc)



More information about the Zope-CVS mailing list