From kde-commits  Wed Dec 16 13:58:21 2015
From: Patrick Spendrin <ps_ml () gmx ! de>
Date: Wed, 16 Dec 2015 13:58:21 +0000
To: kde-commits
Subject: [emerge] portage/dev-util/git: do not fail if git-bash doesn't work
Message-Id: <E1a9Caz-00012b-1E () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=145027431131276

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=3Dpost-install.bat", cwd =3D os.path.join( EmergeStandardDirs.=
emergeRoot(), "dev-utils", "git")):
-            return False
+        gitbash =3D os.path.join(self.rootdir, "dev-utils", "git", "git-ba=
sh.exe")
+        utils.system( "%s --no-needs-console --hide --no-cd --command=3Dpo=
st-install.bat" % gitbash, cwd =3D os.path.join( EmergeStandardDirs.emergeR=
oot(), "dev-utils", "git"))
         tmpFile =3D tempfile.TemporaryFile()
         git =3D os.path.join(self.rootdir,"dev-utils","git","bin","git")
         utils.system( "%s config --global --get url.git://anongit.kde.org/=
.insteadof" % git,