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

List:       kde-commits
Subject:    kdesupport/emerge/bin/Source
From:       Andre Heinecke <aheinecke () intevation ! de>
Date:       2010-11-09 14:59:49
Message-ID: 20101109145949.12C4FAC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1194707 by aheinecke:

Gerneralize the option to fail when patches dont apply.


 M  +3 -4      GitSource.py  
 M  +2 -0      SourceBase.py  


--- trunk/kdesupport/emerge/bin/Source/GitSource.py #1194706:1194707
@@ -148,15 +148,14 @@
                 if repoBranch == "":
                     repoBranch = "master"
                 sourceDir = os.path.join(self.checkoutDir(),repoBranch)
+                return self.shell.execute(sourceDir, "git", "apply --whitespace=fix -p %s %s" % \
+                        (patchdepth, self.shell.toNativePath(patchfile)))
             else:
                 sourceDir = self.sourceDir()
                 #FIXME this reverts previously applied patches !
                 #self.shell.execute(sourceDir, "git", "checkout -f")
-            success = self.shell.execute(sourceDir, "git", "apply --whitespace=fix -p %s %s" % \
+                return self.shell.execute(sourceDir, "git", "apply --whitespace=fix -p %s %s" % \
                         (patchdepth, self.shell.toNativePath(patchfile)))
-            if not success and os.getenv("EMERGE_STRICT_PATCHING"):
-                utils.die("Applying patch %s failed!" % patchfile )
-            return success
         return True
 
     def createPatch( self ):
--- trunk/kdesupport/emerge/bin/Source/SourceBase.py #1194706:1194707
@@ -70,6 +70,8 @@
                     utils.debug( "applying %s with patchlevel: %s" % ( file, patchdepth ) )
                     if not self.applyPatch( file, patchdepth ):
                         ret = False
+                        if os.getenv("EMERGE_STRICT_PATCHING"):
+                            utils.die("Patch %s failed to apply!" % file)
                 return ret
             else:
                 ( file, patchdepth ) = patches
[prev in list] [next in list] [prev in thread] [next in thread]