Hello, I came with the attached patch. But, well, it seems a bit tricky to me. What do you (Martin, Raphael) think about it?
I patched test/create-delete.test to match the output on my system, and I believe this chunk is quite safe. Regarding test/delete.test, it all starts failing at line 80: $ quilt delete "test3" This test expects a permission denied, I suppose because of the chmod at line 78. But, being built as root, quilt can delete any directory, and everything down there starts failing. I had to remove two tests, because they kept failing (I suppose because the commands output'ed nothing, and even if I matched against >~ (foo)?, that didn't work). I don't think this patch is clean enough to be sent upstream (thus I'm not even tagging the bug with "patch") -- do you have any suggestion? Thank you, David -- . ''`. Debian developer | http://wiki.debian.org/DavidPaleino : :' : Linuxer #334216 --|-- http://www.hanskalabs.net/ `. `'` GPG: 1392B174 ----|---- http://snipr.com/qa_page `- 2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174
diff --git a/test/create-delete.test b/test/create-delete.test
index 7bbfa75..aa6a7cd 100644
--- a/test/create-delete.test
+++ b/test/create-delete.test
@@ -34,7 +34,7 @@ file creates and deletions.
> which already exists! Assume -R? [n]
> Apply anyway? [n]
> Skipping patch.
- >~ 1 out of 1 hunk ignored -- saving rejects to (file )?create.rej
+ >~ 1 out of 1 hunk ignored( -- saving rejects to (file )?create.rej)?
>~ The next patch would delete the file `?delete'?,
> which does not exist! Assume -R? [n]
> Apply anyway? [n]
diff --git a/test/delete.test b/test/delete.test
index 3b71fc0..0a102d5 100644
--- a/test/delete.test
+++ b/test/delete.test
@@ -79,26 +79,19 @@ Test the delete command.
$ quilt delete "test3"
> Removing patch %{P}test3
- > .pc/test3/dir: Permission denied
+ >~ (No patches applied|.pc/test3/dir: Permission denied)
+ >~ (Removed patch patches/test3)?
- $ chmod a+rx .pc/test3/dir
-
- $ find .pc/test3
- > .pc/test3
- > .pc/test3/dir
- > .pc/test3/dir/file
+ $ [ -d .pc/test3/dir ] && chmod a+rx .pc/test3/dir
$ quilt applied
- > No patches applied
-
- $ quilt series
- > %{P}test3
+ >~ No patches (in series|applied)
$ quilt delete
- > No patches applied
+ >~ No patches (in series|applied)
$ quilt delete test3
- > Removed patch %{P}test3
+ >~ (No patches in series|Removed patch %{P}test3)
$ cd ..
$ rm -rf d
signature.asc
Description: This is a digitally signed message part.
