summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Rcs/bzr.pm2
-rw-r--r--debian/changelog1
-rw-r--r--doc/bugs/bzr-update-syntax-error.mdwn2
3 files changed, 4 insertions, 1 deletions
diff --git a/IkiWiki/Rcs/bzr.pm b/IkiWiki/Rcs/bzr.pm
index 526036bf3..7ab2fd2c5 100644
--- a/IkiWiki/Rcs/bzr.pm
+++ b/IkiWiki/Rcs/bzr.pm
@@ -43,7 +43,7 @@ sub bzr_log ($) { #{{{
} #}}}
sub rcs_update () { #{{{
- my @cmdline = ("bzr", $config{srcdir}, "update");
+ my @cmdline = ("bzr", "update", $config{srcdir});
if (system(@cmdline) != 0) {
warn "'@cmdline' failed: $!";
}
diff --git a/debian/changelog b/debian/changelog
index 7d02f5924..5db99a2fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
ikiwiki (2.43) UNRELEASED; urgency=low
* Fix missing import of escapeHTML in userlink. (Scott Bronson)
+ * Fix broken rcs_update for bzr. (Scott Bronson)
-- Joey Hess <joeyh@debian.org> Thu, 10 Apr 2008 17:36:53 -0400
diff --git a/doc/bugs/bzr-update-syntax-error.mdwn b/doc/bugs/bzr-update-syntax-error.mdwn
index 8ae609838..800e5ebb2 100644
--- a/doc/bugs/bzr-update-syntax-error.mdwn
+++ b/doc/bugs/bzr-update-syntax-error.mdwn
@@ -7,3 +7,5 @@ It should be:
my @cmdline = ("bzr", "update", $config{srcdir});
The former produces errors such as "_bzr: ERROR: unknown command "/home/user/ikiwiki/posts_", "_'bzr /home/user/ikiwiki/posts update' failed: Inappropriate ioctl for device at /usr/share/perl5/IkiWiki/Rcs/bzr.pm line 48._".
+
+[[done]], thanks --[[Joey]]