svn: Fix rcs_rename to properly scope call to dirname.

diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index fe55e7d0853a8ddcb78171fc3b6ffde3b62ad675..06b987f51ce756676aa977c2c95af0aa4628e952 100644 (file)
--- 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
        
        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") {
                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");
                        }
                        if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) {
                                warn("svn add $parent failed\n");

diff --git a/debian/changelog b/debian/changelog
index 239b22b4222db44d2d69de6ca1ea9421d50953aa..e83e570d315874f82314bbe1408faf8fa5ef9060 100644 (file)
--- 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 <joeyh@debian.org>  Wed, 08 Jul 2009 13:10:38 -0400
+

 ikiwiki (3.1415) unstable; urgency=low
 
   * img: Fix extra double quote with alt text. (smcv)
 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 4f2257891ea684db2ad864213231217ba7c021c2..1a737df0aca788ace8ed070951149b6b27161aa6 100644 (file)
--- 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");
 
                             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]]