summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlav Vitters <olav@vitters.nl>2017-02-06 19:05:17 +0100
committerOlav Vitters <olav@vitters.nl>2017-02-06 19:05:17 +0100
commit82725ef6d5b1cc5127b33b522211fc35d30893ee (patch)
treef07251274179911ccba5a83fcd4a649cff7abceb
parentd8197a21172ce4b1a9591f3a7ff8c346743a9027 (diff)
downloadmgagnome-82725ef6d5b1cc5127b33b522211fc35d30893ee.tar
mgagnome-82725ef6d5b1cc5127b33b522211fc35d30893ee.tar.gz
mgagnome-82725ef6d5b1cc5127b33b522211fc35d30893ee.tar.bz2
mgagnome-82725ef6d5b1cc5127b33b522211fc35d30893ee.tar.xz
mgagnome-82725ef6d5b1cc5127b33b522211fc35d30893ee.zip
be more strict in determining if patch has been merged
-rwxr-xr-xmgagnome2
1 files changed, 1 insertions, 1 deletions
diff --git a/mgagnome b/mgagnome
index 0a685c8..2cfc16a 100755
--- a/mgagnome
+++ b/mgagnome
@@ -633,7 +633,7 @@ class SpecFile(object):
has_ignored = False
has_failed = False
for line in cmd_output:
- if 'FAILED' in line:
+ if 'FAILED' in line or 'File to patch:' in line or 'saving rejects to file' in line:
has_failed = True
break
elif 'ignored' in line: