summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Quinson <martin.quinson@loria.fr>2012-01-02 11:06:14 +0100
committerMartin Quinson <martin.quinson@loria.fr>2012-01-02 11:06:14 +0100
commit62b5e2171c9d3e311664d8f7997927206271cdf3 (patch)
treed2823468d98dace28f626efc8f56e874c3bbdcb7
parent5f17e6f29c22282a4bf2819ac7ee08c942e6e103 (diff)
downloadquilt-62b5e2171c9d3e311664d8f7997927206271cdf3.tar.gz
add a check that QUILT_PATCHES != QUILT_PC.
Rational: If QUILT_PATCHES and QUILT_PC are set to the same directory, the awk script in filenames_in_patch (in scripts/patchfns) will break with a '<patchname> is a directory' error. Patch provided by anonymous in #30956 on savannah
-rw-r--r--quilt/new.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/quilt/new.in b/quilt/new.in
index a43b452..68aae20 100644
--- a/quilt/new.in
+++ b/quilt/new.in
@@ -83,6 +83,12 @@ then
usage
fi
+if [ "$QUILT_PATCHES" = "$QUILT_PC" ]
+then
+ printf $"QUILT_PATCHES(%s) must differ from QUILT_PC(%s)\n" "$QUILT_PATCHES" "$QUILT_PC"
+ exit 1
+fi
+
patch=${1#$QUILT_PATCHES/}
if patch_in_series $patch