forked from pool/quilt
36 lines
936 B
Diff
36 lines
936 B
Diff
|
From: Jean Delvare <jdelvare@suse.de>
|
||
|
|
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.
|
||
|
|
---
|
||
|
|
Originally (commit b704611d) existing files were checked for both
|
||
|
|
before and after unpacking the tar files. Commit 639f2f9c dropped
|
||
|
|
the second check, while I believe it should have dropped the first.
|
||
|
|
Andreas, is there any reason to check before unpacking too?
|
||
|
|
|
||
|
|
quilt/setup.in | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- 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
|