[Quilt-dev] [PATCH 1/2] pop: Correctly report pop failure cause.

[Benjamin Poirier]

Because of the extra condition that was present, in the case where patching
the original file(s) fails, the situation was incorrectly reported as "Patch
[...] does not remove cleanly" whereas it should be "Failed to patch temporary
files".
---
 quilt/pop.in |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/quilt/pop.in b/quilt/pop.in
index efacf09..8b69f64 100644
--- a/quilt/pop.in
+++ b/quilt/pop.in
@@ -111,12 +111,9 @@ check_for_pending_changes()
                             --no-backup-if-mismatch -E \
                             >/dev/null 2>/dev/null
                then
-                       if ! [ -e $QUILT_PC/$patch ]
-                       then
-                               printf $"Failed to patch temporary files\n" >&2
-                               rm -rf $workdir
-                               return 1
-                       fi
+                       printf $"Failed to patch temporary files\n" >&2
+                       rm -rf $workdir
+                       return 1
                fi
        fi
 
-- 
1.7.7