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

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

Browse Source 
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 <luke@diamand.org>
Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
Luke Diamand 2015-11-21 09:54:40 +00:00 committed by Jeff King
parent 74b6fe9202
commit cbff4b25e4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-p4.py
View File

@ -192,14 +192,16 @@ def p4_has_move_command():
# assume it failed because @... was invalid changelist # assume it failed because @... was invalid changelist
return True return True
def system(cmd): def system(cmd, ignore_error=False):
expand = isinstance(cmd,basestring) expand = isinstance(cmd,basestring)
if verbose: if verbose:
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: if retcode and not ignore_error:
raise CalledProcessError(retcode, cmd) raise CalledProcessError(retcode, cmd)
return retcode
def p4_system(cmd): def p4_system(cmd):
"""Specifically invoke p4 as the system command. """ """Specifically invoke p4 as the system command. """
real_cmd = p4_build_cmd(cmd) real_cmd = p4_build_cmd(cmd)