From 50a9ef47538666c565c26ad7125a9e6484330cfd Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sat, 17 Mar 2007 23:32:48 +0000
Subject: [PATCH] * Make ikiwiki -verbose -setup with a setup file that enabled
syslog logging output the verbose build log to stdout, rather than to the
syslog.
---
IkiWiki/Setup/Standard.pm | 1 +
debian/changelog | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index f3f7bae5a..c279e6451 100644
--- 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 2a09196e2..ee860a08e 100644
--- 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
--
2.39.5