* Make ikiwiki -verbose -setup with a setup file that enabled syslog logging

  output the verbose build log to stdout, rather than to the syslog.

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index f3f7bae5a746d0b6d0ef67b7866a8bcad80aa3f3..c279e6451e738505e0ceb5b3e47e96087312c5b9 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -45,6 +45,7 @@ sub setup_standard {
        }
        
        foreach my $c (keys %setup) {
+               next if $c eq 'syslog';
                if (defined $setup{$c}) {
                        if (! ref $setup{$c}) {
                                $config{$c}=possibly_foolish_untaint($setup{$c});

diff --git a/debian/changelog b/debian/changelog
index 2a09196e2f6fc3264d8cb34221efb2ba6e5258bf..ee860a08e349db9ccf341565caf5b2f081ffcaf2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ ikiwiki (1.46) UNRELEASED; urgency=low
   * French update. Closes: #414597
   * Fix some broken logic in cgi creation of a subpage when a toplevel page
     with the same name already exists, and generally simplify the edit code.
+  * Make ikiwiki -verbose -setup with a setup file that enabled syslog logging
+    output the verbose build log to stdout, rather than to the syslog.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 17 Mar 2007 18:25:59 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 17 Mar 2007 19:31:31 -0400
 
 ikiwiki (1.45) unstable; urgency=low