Correct --dumpsetup to include the srcdir in the setup file.
parent
04a03c097a
commit
91cb55d96b
|
@ -8,6 +8,7 @@ ikiwiki (2.71) UNRELEASED; urgency=low
|
||||||
* French translation update from Philippe Batailler. Closes: #506250
|
* French translation update from Philippe Batailler. Closes: #506250
|
||||||
* Spanish translation update from Victor Moral.
|
* Spanish translation update from Victor Moral.
|
||||||
* Fix handling of wrappergroup option.
|
* 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
|
-- Joey Hess <joeyh@debian.org> Mon, 17 Nov 2008 14:02:10 -0500
|
||||||
|
|
||||||
|
|
|
@ -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 => ''.
|
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]]
|
||||||
|
|
|
@ -163,7 +163,8 @@ sub main () { #{{{
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($config{dumpsetup}) {
|
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};
|
$config{syslog}=1 if $config{setupsyslog};
|
||||||
require IkiWiki::Setup;
|
require IkiWiki::Setup;
|
||||||
IkiWiki::Setup::dump($config{dumpsetup});
|
IkiWiki::Setup::dump($config{dumpsetup});
|
||||||
|
|
Loading…
Reference in New Issue