diff options
| author | Martin Quison <mquinson@chaipa.loria.fr> | 2019-04-15 09:26:53 +0200 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2019-04-15 09:26:53 +0200 |
| commit | 322360e2cb7e0a8ee510b49494c8c23e156f635d (patch) | |
| tree | eb53b85b73e1e020822aa50b659f464148e937d9 | |
| parent | 457dfa06c506db0f5685ef112499160e7c7ec42e (diff) | |
| download | quilt-322360e2cb7e0a8ee510b49494c8c23e156f635d.tar.gz | |
setup: Don't obey the settings of any englobing .pc
This is mainly intended to get the setup.test working even if the
debian package contains a .pc directory. Without this patch, the
debian packaging stuff will get the testsuite using debian/patches
instead of patches (because it's the way it goes in our .pc). The
test breaks with that setting.
The patch changes the setup command to not take the settings of any
.pc directory found, and reset QUILT_PC QUILT_PATCHES and QUILT_SERIES
to their default values.
This fixes Debian bug #573689:
http://bugs.debian.org/573689
| -rw-r--r-- | quilt/setup.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/quilt/setup.in b/quilt/setup.in index 3545a28..fba6f03 100644 --- a/quilt/setup.in +++ b/quilt/setup.in @@ -20,8 +20,13 @@ then . $QUILT_DIR/scripts/patchfns if [ -n "$SUBDIR" ] then + # Damn, found an enclosing quilt directory; don't follow its settings cd $SUBDIR unset SUBDIR + unset QUILT_PC QUILT_PATCHES QUILT_SERIES + : ${QUILT_PC:=.pc} + : ${QUILT_PATCHES:=patches} + : ${QUILT_SERIES:=series} fi fi |