aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-10-29 14:28:55 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-10-29 14:28:55 -0400
commit26e1fe20218f8072a807c24eb129ecd5948b7d06 (patch)
tree55670760cc25b75261f0e3dc6f74b7537c40c32a
parent33a0e84ddbb9fe9c068cb40641ccec8554514151 (diff)
downloadikiwiki-26e1fe20218f8072a807c24eb129ecd5948b7d06.tar
ikiwiki-26e1fe20218f8072a807c24eb129ecd5948b7d06.tar.gz
Preserve syslog setting when doing `ikiwiki -setup foo -dumpsetup bar`
The syslog value from the setup file is purposfully ignored when doing ikiwiki -setup, so that it will output to stdout (while generating wrappers that do use the syslog). But that caused -dumpsetup to not preserve the syslog value from the setup file.
-rw-r--r--debian/changelog1
-rwxr-xr-xikiwiki.in1
2 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 4547cda3d..bee31b36e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ ikiwiki (2.68) UNRELEASED; urgency=low
used to set up anonymous git pushes, and other similar things.
* git: Allow [[sha1_commit]] to be used in the diffurl, to support cgit.
* shortcut: Fix display of shortcuts while previewing.
+ * Preserve syslog setting when doing `ikiwiki -setup foo -dumpsetup bar`
-- Joey Hess <joeyh@debian.org> Fri, 17 Oct 2008 20:11:02 -0400
diff --git a/ikiwiki.in b/ikiwiki.in
index af5cabdc0..ca499b115 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -163,6 +163,7 @@ sub main () { #{{{
if ($config{dumpsetup}) {
$config{srdir}=$config{destdir}="";
+ $config{syslog}=1 if $config{setupsyslog};
require IkiWiki::Setup;
IkiWiki::Setup::dump($config{dumpsetup});
}