Correct --dumpsetup to include the srcdir in the setup file.

diff --git a/debian/changelog b/debian/changelog
index 39bca7a10fd81217298a0f695d4c0d698741ff93..649dfeb0a720ca19d108fc845dcc601d30f178b2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ikiwiki (2.71) UNRELEASED; urgency=low
   * French translation update from Philippe Batailler. Closes: #506250
   * Spanish translation update from Victor Moral.
   * Fix handling of wrappergroup option.
+  * Correct --dumpsetup to include the srcdir in the setup file.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 17 Nov 2008 14:02:10 -0500
 

diff --git a/doc/bugs/dumpsetup_does_not_save_destdir.mdwn b/doc/bugs/dumpsetup_does_not_save_destdir.mdwn
index 2f62489af435d3b092780d63d5acfd6430ffa24d..768c3fc5e32ca2b88b37d57902dfdf452d86a76e 100644 (file)
--- a/doc/bugs/dumpsetup_does_not_save_destdir.mdwn
+++ b/doc/bugs/dumpsetup_does_not_save_destdir.mdwn
@@ -1 +1,3 @@
 Calling ikiwiki with a bunch of options, including the --dumpsetup somefile.setup option creates somefile.setup for later reuse with the --setup option. The destination dir however is not saved in the setup file, it has destdir => ''.
+
+> that broke in version 2.64 .. fixed [[done]] --[[Joey]]

diff --git a/ikiwiki.in b/ikiwiki.in
index 344b881489de4c31865a4abb610be4ddef2f0fa3..473cbdbfd059351afe086257909ff1b8dc4f1da5 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -163,7 +163,8 @@ sub main () { #{{{
        }
 
        if ($config{dumpsetup}) {
-               $config{srdir}=$config{destdir}="";
+               $config{srcdir}="" if ! defined $config{srcdir};
+               $config{destdir}="" if ! defined $config{destdir};
                $config{syslog}=1 if $config{setupsyslog};
                require IkiWiki::Setup;
                IkiWiki::Setup::dump($config{dumpsetup});