Hi all,
A few days ago I gave a try to Andrew Morton's 2.6.12-mm1 broken-out
patch series in quilt. "quilt push -a" choked on the followig line of
the series file:
kprobes-ia64-cmp-ctype-unc-support.patch # fold
It happens that quilt doesn't support this type of comment in series
files. Comments alone on their line are OK, but comments on a patch file
line are not. In fact, quilt expects to find options to pass to the
patch command at this place (like -p1), and it will dumbly pass the
comment to patch, causing push to fail horribly.
Attached is a patch adding support for this kind of comment in series
files. Does this look acceptable?
Thanks,
--
Jean Delvare
Index: scripts/patchfns.in
===================================================================
RCS file: /cvsroot/quilt/quilt/scripts/patchfns.in,v
retrieving revision 1.62
diff -u -r1.62 patchfns.in
--- scripts/patchfns.in 6 Jun 2005 19:34:28 -0000 1.62
+++ scripts/patchfns.in 25 Jun 2005 18:19:45 -0000
@@ -108,8 +108,8 @@
then
@AWK@ '
$1 == "'"$patch"'" \
- { if (NF >= 2)
- for (i=2; i <= NF; i++)
+ { if (NF >= 2 && $2 !~ "^#")
+ for (i=2; i <= NF && $i !~ "^#"; i++)
print $i
else
print "-p1" ;
Index: test/comments.test
===================================================================
RCS file: /cvsroot/quilt/quilt/test/comments.test,v
retrieving revision 1.3
diff -u -r1.3 comments.test
--- test/comments.test 9 Jul 2004 07:26:40 -0000 1.3
+++ test/comments.test 25 Jun 2005 18:43:42 -0000
@@ -19,7 +19,7 @@
< +two
$ cat > patches/series
- < test.diff -p0
+ < test.diff -p0 # What a wonderful patch
$ quilt push
> Applying patch %{P}test.diff
_______________________________________________
Quilt-dev mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/quilt-dev
