Hello,
On Saturday 02 June 2007 18:16, Ben Pfaff wrote:
> +.IP QUILT_SERIES 4
> +
> +The name of the series file, relative to QUILT_PATCHES, overriding the
> +usual search algorithm.
> +
"relative to QUILT_PATCHES" is not quite correct, and there is a bug with
QUILT_SERIES=foo and doing a ``quilt new'' from within a sub-directory.
How about the attached version + fix?
Thanks,
Andreas
? fix-revert.diff
? series.diff
? quilt/revert
Index: doc/quilt.1.in
===================================================================
RCS file: /sources/quilt/quilt/doc/quilt.1.in,v
retrieving revision 1.16
diff -u -r1.16 quilt.1.in
--- doc/quilt.1.in 18 Sep 2006 21:39:26 -0000 1.16
+++ doc/quilt.1.in 5 Jun 2007 15:20:10 -0000
@@ -80,8 +80,8 @@
.B diff
documentation).
-The series file is looked up in the root of the source tree, in the patches
-directory, and in the .pc directory. The first series file that is found is
+The series file is looked up in the .pc directory, in the root of the source
+tree, and in the patches directory. The first series file that is found is
used. This may also be a symbolic link, or a file with multiple hard links.
Usually, only one series file is used for a set of patches, so the
patches sub-directory is a convenient location.
@@ -176,6 +176,11 @@
The location of patch files, defaulting to "patches".
+.IP QUILT_SERIES 4
+
+The name of the series file, defaulting to "series". Unless an absolute path
+is used, the search algorithm described above applies.
+
.IP QUILT_PATCHES_PREFIX 4
If set to anything, quilt will prefix patch names it prints with their
Index: quilt/scripts/patchfns.in
===================================================================
RCS file: /sources/quilt/quilt/quilt/scripts/patchfns.in,v
retrieving revision 1.24
diff -u -r1.24 patchfns.in
--- quilt/scripts/patchfns.in 19 Apr 2007 23:58:35 -0000 1.24
+++ quilt/scripts/patchfns.in 5 Jun 2007 15:20:10 -0000
@@ -1015,17 +1015,19 @@
unset basedir down
fi
-if [ -n "$QUILT_SERIES" ]
+: ${QUILT_SERIES:=series}
+
+if [ "${QUILT_SERIES:0:1}" = / ]
then
SERIES=$QUILT_SERIES
-elif [ -e $QUILT_PC/series ]
+elif [ -e $QUILT_PC/$QUILT_SERIES ]
then
- SERIES=$QUILT_PC/series
-elif [ -e series ]
+ SERIES=$QUILT_PC/$QUILT_SERIES
+elif [ -e $QUILT_SERIES ]
then
- SERIES=series
+ SERIES=$QUILT_SERIES
else
- SERIES=$QUILT_PATCHES/series
+ SERIES=$QUILT_PATCHES/$QUILT_SERIES
fi
DB="$QUILT_PC/applied-patches"
_______________________________________________
Quilt-dev mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/quilt-dev
