From: dsal3389 <dsal3389@xxxxxxxxx>
L371
redesign few lines to get rid of the "else" statement
L404
moved the if statement below another if statement that
checks if it should exit the code, only if it doesnt need to,
then we can iterate the for loop and decode the text
Changes to be committed:
modified: git-p4.py
Signed-off-by: Daniel Sonbolian <dsal3389@xxxxxxxxx>
---
git-p4.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index d26a980e5ac..0ba5115fa2e 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -368,10 +368,9 @@ def read_pipe(c, ignore_error=False, raw=False, *k, **kw):
"""
retcode, out, err = read_pipe_full(c, *k, **kw)
if retcode != 0:
- if ignore_error:
- out = ""
- else:
+ if not ignore_error:
die('Command failed: {}\nError: {}'.format(' '.join(c), err))
+ out = ""
if not raw:
out = decode_text_stream(out)
return out
@@ -400,10 +399,10 @@ def read_pipe_lines(c, raw=False, *k, **kw):
p = subprocess.Popen(c, stdout=subprocess.PIPE, *k, **kw)
pipe = p.stdout
lines = pipe.readlines()
- if not raw:
- lines = [decode_text_stream(line) for line in lines]
if pipe.close() or p.wait():
die('Command failed: {}'.format(' '.join(c)))
+ if not raw:
+ lines = [decode_text_stream(line) for line in lines]
return lines
--
gitgitgadget
