From: Ben Keene <seraphire@xxxxxxxxx>
The original code unconditionally used "p4" as the binary filename.
Depending on the version of Git and Python installed, the perforce
program (p4) may not resolve on Windows without the program extension.
Check the operating system (platform.system) and if it is reporting that
it is Windows, use the full filename of "p4.exe" instead of "p4"
This change is Python 2 and Python 3 compatible.
Signed-off-by: Ben Keene <seraphire@xxxxxxxxx>
---
git-p4.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/git-p4.py b/git-p4.py
index 60c73b6a37..65e926758c 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -75,7 +75,10 @@ def p4_build_cmd(cmd):
location. It means that hooking into the environment, or other configuration
can be done more easily.
"""
- real_cmd = ["p4"]
+ if (platform.system() == "Windows"):
+ real_cmd = ["p4.exe"]
+ else:
+ real_cmd = ["p4"]
user = gitConfig("git-p4.user")
if len(user) > 0:
--
gitgitgadget
