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

List:       kde-commits
Subject:    [emerge] portage/dev-util/git: do not fail if git-bash doesn't work
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2015-12-16 13:58:21
Message-ID: E1a9Caz-00012b-1E () scm ! kde ! org
[Download RAW message or body]

Git commit ac4407ee07477df2f2b146fce800221545230bd9 by Patrick Spendrin.
Committed on 16/12/2015 at 12:46.
Pushed by sengels into branch 'master'.

do not fail if git-bash doesn't work

M  +2    -2    portage/dev-util/git/git.py

http://commits.kde.org/emerge/ac4407ee07477df2f2b146fce800221545230bd9

diff --git a/portage/dev-util/git/git.py b/portage/dev-util/git/git.py
index bc74147..6ae7764 100644
--- a/portage/dev-util/git/git.py
+++ b/portage/dev-util/git/git.py
@@ -41,8 +41,8 @@ class Package(BinaryPackageBase):
     def qmerge(self):
         if not BinaryPackageBase.qmerge(self):
             return False
-        if not utils.system( "git-bash.exe --no-needs-console --hide --no-cd \
--command=post-install.bat", cwd = os.path.join( EmergeStandardDirs.emergeRoot(), \
                "dev-utils", "git")):
-            return False
+        gitbash = os.path.join(self.rootdir, "dev-utils", "git", "git-bash.exe")
+        utils.system( "%s --no-needs-console --hide --no-cd \
--command=post-install.bat" % gitbash, cwd = os.path.join( \
EmergeStandardDirs.emergeRoot(), "dev-utils", "git"))  tmpFile = \
tempfile.TemporaryFile()  git = \
                os.path.join(self.rootdir,"dev-utils","git","bin","git")
         utils.system( "%s config --global --get \
url.git://anongit.kde.org/.insteadof" % git,


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