forked from pool/quilt
44 lines
1.1 KiB
Diff
44 lines
1.1 KiB
Diff
|
From: Jean Delvare <jdelvare@suse.de>
|
||
|
|
Subject: setup: Skip version check
|
||
|
|
Upstream: Committed (a626fcf8b95f2ff51701a00d65043b9f65207514)
|
||
|
|
|
||
|
|
The version check is irrelevant when running "quilt setup", as it is
|
||
|
|
creating a brand new working tree anyway.
|
||
|
|
|
||
|
|
Reported by Petr Tesarik.
|
||
|
|
---
|
||
|
|
diff --git a/quilt/setup.in b/quilt/setup.in
|
||
|
|
index 36d0d24..a90c5ad 100644
|
||
|
|
--- a/quilt/setup.in
|
||
|
|
+++ b/quilt/setup.in
|
||
|
|
@@ -6,6 +6,9 @@
|
||
|
|
#
|
||
|
|
# See the COPYING and AUTHORS files for more details.
|
||
|
|
|
||
|
|
+# Version check is irrelevant to this command.
|
||
|
|
+skip_version_check=1
|
||
|
|
+
|
||
|
|
# Read in library functions
|
||
|
|
if [ "$(type -t patch_file_name)" != function ]
|
||
|
|
then
|
||
|
|
diff --git a/test/setup.test b/test/setup.test
|
||
|
|
index 5a39475..69725ec 100644
|
||
|
|
--- a/test/setup.test
|
||
|
|
+++ b/test/setup.test
|
||
|
|
@@ -32,6 +32,13 @@ $ quilt push -qa
|
||
|
|
> Now at patch patches/again.diff
|
||
|
|
$ cd ..
|
||
|
|
$ rm -rf dir
|
||
|
|
+
|
||
|
|
+# Quilt setup should happily ignore patches and .pc directories
|
||
|
|
+$ mkdir .pc patches
|
||
|
|
+$ quilt setup series
|
||
|
|
+> Unpacking archive dir.tar.gz
|
||
|
|
+$ rm -rf dir .pc patches
|
||
|
|
+
|
||
|
|
$ quilt setup -d other series
|
||
|
|
> Unpacking archive dir.tar.gz
|
||
|
|
$ cd other/dir
|
||
|
|
--
|
||
|
|
cgit v0.9.0.2
|