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

List:       kde-commits
Subject:    kdesupport/emerge/bin/Source
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2010-11-10 10:23:26
Message-ID: 20101110102326.15481AC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1195086 by sengels:

generalize that with the setting EMERGE_HOLD_ON_PATCH_FAIL it holds everywhere

 M  +4 -1      ArchiveSource.py  
 M  +1 -1      VersionSystemSourceBase.py  


--- trunk/kdesupport/emerge/bin/Source/ArchiveSource.py #1195085:1195086
@@ -142,7 +142,10 @@
         if not utils.unpackFiles( self.downloadDir(), filenames, destdir ):
             return False
 
-        return self.applyPatches()
+        ret = self.applyPatches()
+        if os.getenv( "EMERGE_HOLD_ON_PATCH_FAIL" ) == "True" or os.getenv( \
"EMERGE_HOLD_ON_PATCH_FAIL" ) == "1": +            return ret;
+        return True;
 
     def createPatch( self ):
         """ unpacking all zipped(gz,zip,bz2) tarballs a second time and making a \
                patch """
--- trunk/kdesupport/emerge/bin/Source/VersionSystemSourceBase.py #1195085:1195086
@@ -68,7 +68,7 @@
             utils.copySrcDirToDestDir(sourceDir, self.buildDir())
         ret = self.applyPatches()
         if os.getenv( "EMERGE_HOLD_ON_PATCH_FAIL" ) == "True" or os.getenv( \
                "EMERGE_HOLD_ON_PATCH_FAIL" ) == "1":
-            return ret
+            return ret;
         return True;
         
     def repositoryUrlCount( self ):


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