From 59dcb8b4e06cbfaab7fe4f5424a5633ce7ce0d12 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 25 Oct 2012 17:42:46 +0200 Subject: setup: Check for existing files after unpacking setup: check for existing files after unpacking the tar files, not before, otherwise we check too early and a tar file containing a "patches" directory will not be handled properly. --- quilt.changes | 5 +++++ quilt/setup.in | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/quilt.changes b/quilt.changes index 8c9d9c6..3e2a2fe 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 25 15:05:42 CEST 2012 - jdelvare@suse.de + +- setup: Check for existing files after unpacking, not before. + ------------------------------------------------------------------- Thu Oct 25 15:05:10 CEST 2012 - jdelvare@suse.de diff --git a/quilt/setup.in b/quilt/setup.in index 90a8c85..09f0fe9 100644 --- a/quilt/setup.in +++ b/quilt/setup.in @@ -183,8 +183,6 @@ case "$1" in ;; esac -check_for_existing_files || exit 1 - while read tag dir arg1 arg2 do case "$tag" in @@ -203,6 +201,8 @@ do esac done < $tmpfile +check_for_existing_files || exit 1 + while read tag dir arg1 arg2 do case "$tag" in -- cgit