From 40e7cfdd46eb14e63ae4238e3a067d955de54a3d Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Thu, 6 Jan 2022 21:41:56 +0000 Subject: [PATCH] git-p4: fix instantiation of CalledProcessError 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 Signed-off-by: Junio C Hamano --- git-p4.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-p4.py b/git-p4.py index 986595bef0..eefac27803 100755 --- a/git-p4.py +++ b/git-p4.py @@ -394,7 +394,7 @@ def system(cmd, ignore_error=False): sys.stderr.write("executing %s\n" % str(cmd)) retcode = subprocess.call(cmd, shell=expand) if retcode and not ignore_error: - raise CalledProcessError(retcode, cmd) + raise subprocess.CalledProcessError(retcode, cmd) return retcode @@ -404,7 +404,7 @@ def p4_system(cmd): expand = not isinstance(real_cmd, list) retcode = subprocess.call(real_cmd, shell=expand) if retcode: - raise CalledProcessError(retcode, real_cmd) + raise subprocess.CalledProcessError(retcode, real_cmd) def die_bad_access(s): die("failure accessing depot: {0}".format(s.rstrip())) @@ -4169,7 +4169,7 @@ def run(self, args): init_cmd.append("--bare") retcode = subprocess.call(init_cmd) if retcode: - raise CalledProcessError(retcode, init_cmd) + raise subprocess.CalledProcessError(retcode, init_cmd) if not P4Sync.run(self, depotPaths): return False