summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlav Vitters <olav@vitters.nl>2017-02-18 14:51:26 +0100
committerOlav Vitters <olav@vitters.nl>2017-02-18 14:51:26 +0100
commitc22fede7855472159c5bf515db06aea453054d40 (patch)
tree933a36715859dcf15d023f348729f6bd18126627
parent5d030258b71c4c47d10259bf1e9daaad76076812 (diff)
downloadmgagnome-c22fede7855472159c5bf515db06aea453054d40.tar
mgagnome-c22fede7855472159c5bf515db06aea453054d40.tar.gz
mgagnome-c22fede7855472159c5bf515db06aea453054d40.tar.bz2
mgagnome-c22fede7855472159c5bf515db06aea453054d40.tar.xz
mgagnome-c22fede7855472159c5bf515db06aea453054d40.zip
correctly identify merged patches
-rwxr-xr-xmgagnome10
1 files changed, 8 insertions, 2 deletions
diff --git a/mgagnome b/mgagnome
index 7346a69..274ef9a 100755
--- a/mgagnome
+++ b/mgagnome
@@ -631,15 +631,21 @@ class SpecFile(object):
# Patch is merged if there is at least one 'ignored' line and no 'FAILED' line anywhere
has_ignored = False
+ has_reversed = False
has_failed = False
for line in cmd_output:
- if 'FAILED' in line or 'File to patch:' in line or 'saving rejects to file' in line:
+ if 'FAILED' in line or 'File to patch:' in line:
has_failed = True
break
elif 'ignored' in line:
has_ignored = True
+ elif 'saving rejects to file' in line:
+ has_failed = True
+ break
+ elif 'Reversed (or previously applied) patch detected' in line:
+ has_reversed = True
- if has_ignored and not has_failed:
+ if has_ignored and has_reversed and not has_failed:
# If patch was merged, drop it from spec file and rety
print("INFO: Patch has been merged: %s" % failed_patch, file=sys.stdout)
if failed_patch in patches: