27 lines
675 B
Diff
27 lines
675 B
Diff
|
From: Jean Delvare <jdelvare@suse.de>
|
||
|
Subject: setup: Try alternative patches/series names
|
||
|
|
||
|
setup: If a tar file contains a patches directory or a series file,
|
||
|
automatically try alternative names which are less likely to collide.
|
||
|
---
|
||
|
quilt/setup.in | 8 +++++++-
|
||
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
||
|
|
||
|
--- a/quilt/setup.in
|
||
|
+++ b/quilt/setup.in
|
||
|
@@ -201,7 +201,13 @@ do
|
||
|
esac
|
||
|
done < $tmpfile
|
||
|
|
||
|
-check_for_existing_files || exit 1
|
||
|
+if ! check_for_existing_files
|
||
|
+then
|
||
|
+ echo "Trying alternative patches and series names..." >&2
|
||
|
+ QUILT_PATCHES=quilt_patches
|
||
|
+ QUILT_SERIES=quilt_series
|
||
|
+ check_for_existing_files || exit 1
|
||
|
+fi
|
||
|
|
||
|
while read tag dir arg1 arg2
|
||
|
do
|