diff options
author | Jean Delvare <jdelvare@suse.de> | 2012-10-25 17:42:46 +0200 |
---|---|---|
committer | Jean Delvare <jdelvare@suse.de> | 2012-10-25 17:42:46 +0200 |
commit | 59dcb8b4e06cbfaab7fe4f5424a5633ce7ce0d12 (patch) | |
tree | 6a381646f4002c2ede68945e847e53f26bb23eef | |
parent | c28b341556a75ec031c294a82f3a7ba421c753ea (diff) | |
download | quilt-59dcb8b4e06cbfaab7fe4f5424a5633ce7ce0d12.tar.gz |
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.
-rw-r--r-- | quilt.changes | 5 | ||||
-rw-r--r-- | 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,4 +1,9 @@ ------------------------------------------------------------------- +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 - Makefile: Keep reference entries sorted. 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 |