From c22fede7855472159c5bf515db06aea453054d40 Mon Sep 17 00:00:00 2001 From: Olav Vitters Date: Sat, 18 Feb 2017 14:51:26 +0100 Subject: correctly identify merged patches --- mgagnome | 10 ++++++++-- 1 file 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: -- cgit v1.2.1