undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-p4: fix instantiation of CalledProcessError

Browse Source 
CalledProcessError is an exception class from the subprocess namespace.
When raising this exception, git-p4 would instantiate CalledProcessError
objects without properly referencing the subprocess namespace causing
the script to fail.

Resolves the issue by replacing CalledProcessError with
subprocess.CalledProcessError.

Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Joel Holdsworth 2022-01-06 21:41:56 +00:00 committed by Junio C Hamano
parent e83ba647f7
commit 40e7cfdd46
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-p4.py
View File

@ -394,7 +394,7 @@ def system(cmd, ignore_error=False):
sys.stderr.write("executing %s\n" % str(cmd)) sys.stderr.write("executing %s\n" % str(cmd))
retcode = subprocess.call(cmd, shell=expand) retcode = subprocess.call(cmd, shell=expand)
if retcode and not ignore_error: if retcode and not ignore_error:
raise CalledProcessError(retcode, cmd) raise subprocess.CalledProcessError(retcode, cmd)
return retcode return retcode
@ -404,7 +404,7 @@ def p4_system(cmd):
expand = not isinstance(real_cmd, list) expand = not isinstance(real_cmd, list)
retcode = subprocess.call(real_cmd, shell=expand) retcode = subprocess.call(real_cmd, shell=expand)
if retcode: if retcode:
raise CalledProcessError(retcode, real_cmd) raise subprocess.CalledProcessError(retcode, real_cmd)
def die_bad_access(s): def die_bad_access(s):
die("failure accessing depot: {0}".format(s.rstrip())) die("failure accessing depot: {0}".format(s.rstrip()))
@ -4169,7 +4169,7 @@ class P4Clone(P4Sync):
init_cmd.append("--bare") init_cmd.append("--bare")
retcode = subprocess.call(init_cmd) retcode = subprocess.call(init_cmd)
if retcode: if retcode:
raise CalledProcessError(retcode, init_cmd) raise subprocess.CalledProcessError(retcode, init_cmd)
if not P4Sync.run(self, depotPaths): if not P4Sync.run(self, depotPaths):
return False return False