Commit cbff4b25 authored by Luke Diamand's avatar Luke Diamand Committed by Jeff King

git-p4: add option to system() to return subshell status

Add an optional parameter ignore_error to the git-p4 system()
function. If used, it will return the subshell exit status
rather than throwing an exception.
Signed-off-by: Luke Diamand's avatarLuke Diamand <[email protected]>
Signed-off-by: default avatarJeff King <[email protected]>
parent 74b6fe92
......@@ -192,14 +192,16 @@ def p4_has_move_command():
# assume it failed because @... was invalid changelist
return True
def system(cmd):
def system(cmd, ignore_error=False):
expand = isinstance(cmd,basestring)
if verbose:
sys.stderr.write("executing %s\n" % str(cmd))
retcode = subprocess.call(cmd, shell=expand)
if retcode:
if retcode and not ignore_error:
raise CalledProcessError(retcode, cmd)
return retcode
def p4_system(cmd):
"""Specifically invoke p4 as the system command. """
real_cmd = p4_build_cmd(cmd)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment