svn: Fix rcs_rename to properly scope call to dirname.

master
Joey Hess 2009-07-08 13:13:23 -04:00
parent 499c807ea7
commit 0c6a47e9e4
3 changed files with 12 additions and 2 deletions

View File

@ -243,10 +243,10 @@ sub rcs_rename ($$) {
if (-d "$config{srcdir}/.svn") { if (-d "$config{srcdir}/.svn") {
# Add parent directory for $dest # Add parent directory for $dest
my $parent=dirname($dest); my $parent=IkiWiki::dirname($dest);
if (! -d "$config{srcdir}/$parent/.svn") { if (! -d "$config{srcdir}/$parent/.svn") {
while (! -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) { if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) {
warn("svn add $parent failed\n"); warn("svn add $parent failed\n");

6
debian/changelog vendored
View File

@ -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 ikiwiki (3.1415) unstable; urgency=low
* img: Fix extra double quote with alt text. (smcv) * img: Fix extra double quote with alt text. (smcv)

View File

@ -22,3 +22,7 @@ Applying the following patch fixed it:
if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) { if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) {
warn("svn add $parent failed\n"); 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]]