From 0c6a47e9e4c6a5508868b730bed0ac2d0c358ae4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 8 Jul 2009 13:13:23 -0400 Subject: [PATCH] svn: Fix rcs_rename to properly scope call to dirname. --- IkiWiki/Plugin/svn.pm | 4 ++-- debian/changelog | 6 ++++++ ...a_file_via_the_web_is_failing_when_using_subversion.mdwn | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm index fe55e7d08..06b987f51 100644 --- a/IkiWiki/Plugin/svn.pm +++ b/IkiWiki/Plugin/svn.pm @@ -243,10 +243,10 @@ sub rcs_rename ($$) { if (-d "$config{srcdir}/.svn") { # Add parent directory for $dest - my $parent=dirname($dest); + my $parent=IkiWiki::dirname($dest); if (! -d "$config{srcdir}/$parent/.svn") { while (! -d "$config{srcdir}/$parent/.svn") { - $parent=dirname($dest); + $parent=IkiWiki::dirname($dest); } if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) { warn("svn add $parent failed\n"); diff --git a/debian/changelog b/debian/changelog index 239b22b42..e83e570d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.1416) UNRELEASED; urgency=low + + * svn: Fix rcs_rename to properly scope call to dirname. + + -- Joey Hess Wed, 08 Jul 2009 13:10:38 -0400 + ikiwiki (3.1415) unstable; urgency=low * img: Fix extra double quote with alt text. (smcv) diff --git a/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn b/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn index 4f2257891..1a737df0a 100644 --- a/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn +++ b/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn @@ -22,3 +22,7 @@ Applying the following patch fixed it: if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) { warn("svn add $parent failed\n"); + +> Thank you very much for the patch, which I've applied. I wonder how +> that snuck in (aside from the obvious, that the svn plugin is not often +> used and the code was added w/o being tested..). [[done]] --[[Joey]] -- 2.26.2