summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--quilt.changes1
-rw-r--r--quilt/setup.in8
2 files changed, 8 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes
index 3e2a2fe..1c21b69 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -2,6 +2,7 @@
Thu Oct 25 15:05:42 CEST 2012 - jdelvare@suse.de
- setup: Check for existing files after unpacking, not before.
+- setup: Try alternative patches/series names.
-------------------------------------------------------------------
Thu Oct 25 15:05:10 CEST 2012 - jdelvare@suse.de
diff --git a/quilt/setup.in b/quilt/setup.in
index 09f0fe9..bbf26e9 100644
--- 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