summaryrefslogtreecommitdiff
path: root/quilt/patches/fix-test-setup
diff options
context:
space:
mode:
authorIgor Pashev <igor.pashev@nexenta.com>2012-11-13 21:20:46 +0400
committerIgor Pashev <igor.pashev@nexenta.com>2012-11-13 21:20:46 +0400
commitd73deca60d52f13127f8d7f0145fc7bf01f63e85 (patch)
treeb4a949a58ae7f425eb7d14e8a1f6695dc0de9284 /quilt/patches/fix-test-setup
parent135c50cb24211d6cf5873bdb3bb972aaad10f42b (diff)
downloadcibs-pkgs-d73deca60d52f13127f8d7f0145fc7bf01f63e85.tar.gz
Quilt with Debian patches
Diffstat (limited to 'quilt/patches/fix-test-setup')
-rw-r--r--quilt/patches/fix-test-setup20
1 files changed, 20 insertions, 0 deletions
diff --git a/quilt/patches/fix-test-setup b/quilt/patches/fix-test-setup
new file mode 100644
index 0000000..86b3c23
--- /dev/null
+++ b/quilt/patches/fix-test-setup
@@ -0,0 +1,20 @@
+Subject: avoid test failure in setup.test by hardcoding QUILT_PATCHES
+
+Without this patch, quilt setup would try to use debian/patches instead
+of patches and would fail. This is because quilt now initializes
+QUILT_PATCHES by looking up parent directories and it would find
+.pc/.quilt_patches of the debian source package.
+
+The right upstream fix is probably to hardcode the location in quilt setup
+but until that is approved, this fix is less intrusive and doesn't change
+the behaviour of quilt setup.
+
+Bug-Debian: http://bugs.debian.org/573689
+
+--- a/test/setup.test
++++ b/test/setup.test
+@@ -1,3 +1,4 @@
++$ export QUILT_PATCHES=patches
+ $ mkdir dir
+
+ $ echo 1 > dir/foo.orig