* [PATCH v2] git-p4: fixed instantiation of CalledProcessError
@ 2022-01-06 21:41 Joel Holdsworth
0 siblings, 0 replies; only message in thread
From: Joel Holdsworth @ 2022-01-06 21:41 UTC (permalink / raw)
To: git, Luke Diamand, Junio C Hamano, Eric Sunshine
Cc: Tzadik Vanderhoof, Dorgon Chang, Joachim Kuebart, Daniel Levin,
Johannes Schindelin, Ben Keene, Andrew Oakley, Joel Holdsworth
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.
This patch resolves the issue by replacing CalledProcessError with
subprocess.CalledProcessError.
Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
---
This version adds a previously missing sign-off.
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
--
2.34.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-01-06 21:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-06 21:41 [PATCH v2] git-p4: fixed instantiation of CalledProcessError Joel Holdsworth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).