Use bzr --quiet to avoid it outputting stuff and messing up http headers. (Scott Bronson)

master
Joey Hess 2008-04-10 17:44:40 -04:00
parent e4395a567b
commit b698bf2408
3 changed files with 10 additions and 3 deletions

View File

@ -43,7 +43,7 @@ sub bzr_log ($) { #{{{
} #}}}
sub rcs_update () { #{{{
my @cmdline = ("bzr", "update", $config{srcdir});
my @cmdline = ("bzr", "update", "--quiet", $config{srcdir});
if (system(@cmdline) != 0) {
warn "'@cmdline' failed: $!";
}
@ -71,7 +71,7 @@ sub rcs_commit ($$$;$$) { #{{{
$message = "no message given";
}
my @cmdline = ("bzr", "commit", "-m", $message, "--author", $user,
my @cmdline = ("bzr", "commit", "--quiet", "-m", $message, "--author", $user,
$config{srcdir}."/".$file);
if (system(@cmdline) != 0) {
warn "'@cmdline' failed: $!";
@ -83,7 +83,7 @@ sub rcs_commit ($$$;$$) { #{{{
sub rcs_add ($) { # {{{
my ($file) = @_;
my @cmdline = ("bzr", "add", "$config{srcdir}/$file");
my @cmdline = ("bzr", "add", "--quiet", "$config{srcdir}/$file");
if (system(@cmdline) != 0) {
warn "'@cmdline' failed: $!";
}

2
debian/changelog vendored
View File

@ -2,6 +2,8 @@ ikiwiki (2.43) UNRELEASED; urgency=low
* Fix missing import of escapeHTML in userlink. (Scott Bronson)
* Fix broken rcs_update for bzr. (Scott Bronson)
* Use bzr --quiet to avoid it outputting stuff and messing up http headers.
(Scott Bronson)
-- Joey Hess <joeyh@debian.org> Thu, 10 Apr 2008 17:36:53 -0400

View File

@ -21,3 +21,8 @@ The fix is simply to call `bzr` with the _--quiet_ switch. Something like this a
[[tag patch]]
> [[done]], although I left off the escapeHTML thing which seems to be in
> your patch by accident.
>
> (Please use diff -u BTW..) --[[Joey]]