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.

diff --git a/debian/changelog b/debian/changelog
index 4547cda3d551ccd5ee53c0a8121af135bde1293a..bee31b36e7dd3852c95c256a4fba477cd4d12df4 100644 (file)
--- 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.
     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
 
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 

diff --git a/ikiwiki.in b/ikiwiki.in
index af5cabdc04fd687691f3b286a31cc44e2e0428be..ca499b115ae0e758b5a7c38d2fbcc4fd4944c597 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -163,6 +163,7 @@ sub main () { #{{{
 
        if ($config{dumpsetup}) {
                $config{srdir}=$config{destdir}="";
 
        if ($config{dumpsetup}) {
                $config{srdir}=$config{destdir}="";

+               $config{syslog}=1 if $config{setupsyslog};

                require IkiWiki::Setup;
                IkiWiki::Setup::dump($config{dumpsetup});
        }
                require IkiWiki::Setup;
                IkiWiki::Setup::dump($config{dumpsetup});
        }