summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--quilt/pop.in17
1 files changed, 4 insertions, 13 deletions
diff --git a/quilt/pop.in b/quilt/pop.in
index a1bfc3c..4169fa3 100644
--- a/quilt/pop.in
+++ b/quilt/pop.in
@@ -105,19 +105,10 @@ check_for_pending_changes()
if [ -s "$patch_file" ]
then
- if ! cat_file "$patch_file" \
- | patch -d $workdir $QUILT_PATCH_OPTS \
- $(patch_args "$patch") \
- --no-backup-if-mismatch -E -f \
- >/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
- fi
+ cat_file "$patch_file" \
+ | patch -d $workdir $QUILT_PATCH_OPTS \
+ $(patch_args "$patch") --no-backup-if-mismatch \
+ -E -f >/dev/null 2>/dev/null
fi
local file file2 failed