[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [emerge/kde-4.9] bin: Support patches that contain spaces in their filename
From:       Ananta Palani <anantapalani () gmail ! com>
Date:       2013-01-24 14:36:39
Message-ID: 20130124143639.39BEEA6091 () git ! kde ! org
[Download RAW message or body]

Git commit 1fb569b1e1eb89da2851ffae5907c1f9d9180bbe by Ananta Palani.
Committed on 24/01/2013 at 15:35.
Pushed by palani into branch 'kde-4.9'.

Support patches that contain spaces in their filename

M  +1    -1    bin/Source/HgSource.py
M  +1    -1    bin/utils.py

http://commits.kde.org/emerge/1fb569b1e1eb89da2851ffae5907c1f9d9180bbe

diff --git a/bin/Source/HgSource.py b/bin/Source/HgSource.py
index 06793d1..5e9fdd0 100644
--- a/bin/Source/HgSource.py
+++ b/bin/Source/HgSource.py
@@ -66,7 +66,7 @@ class HgSource ( VersionSystemSourceBase ):
         if fileName and self.enableHg:
             patchfile = os.path.join ( self.packageDir(), fileName )
             os.chdir( self.sourceDir() )
-            return self.system( "%s import -p %s %s" % (self.hgExecutable, patchdepth, patchfile) )
+            return self.system( '"%s" import -p %s "%s"' % (self.hgExecutable, patchdepth, patchfile) )
         return True
 
     def createPatch( self ):
diff --git a/bin/utils.py b/bin/utils.py
index 8926b88..2062b28 100644
--- a/bin/utils.py
+++ b/bin/utils.py
@@ -1268,7 +1268,7 @@ def unixToDos(filename):
 
 def applyPatch(sourceDir, f, patchLevel='0'):
     """apply single patch"""
-    cmd = "patch -d %s -p%s < %s" % (sourceDir, patchLevel, f)
+    cmd = 'patch -d "%s" -p%s < "%s"' % (sourceDir, patchLevel, f)
     debug("applying %s" % cmd)
     if not isCrEol(f):
         p = subprocess.Popen([
[prev in list] [next in list] [prev in thread] [next in thread]