diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-08-06 01:58:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-08-06 01:58:04 -0400 |
| commit | adc2eb3d8c900a011000431b01ff4b89d5f4f689 (patch) | |
| tree | 1a1888f6fd43a7065a9a15abcdf15d7cddaef3db /IkiWiki | |
| parent | 6fb6d515247b53641c18c286312eb26b58bb9df3 (diff) | |
| download | ikiwiki-adc2eb3d8c900a011000431b01ff4b89d5f4f689.tar ikiwiki-adc2eb3d8c900a011000431b01ff4b89d5f4f689.tar.gz | |
Options set in the setup file are now immediatly loaded by ikiwiki -setup. This allows later switches to override them. Previously, setup file options overrode most command line options.
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Setup.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm index e014a2a10..f8bb664c4 100644 --- a/IkiWiki/Setup.pm +++ b/IkiWiki/Setup.pm @@ -12,8 +12,8 @@ use File::Spec; sub load ($) { # {{{ my $setup=IkiWiki::possibly_foolish_untaint(shift); - $config{setupfile}=File::Spec->rel2abs($config{setup}); - delete $config{setup}; + $config{setupfile}=File::Spec->rel2abs($setup); + #translators: The first parameter is a filename, and the second #translators: is a (probably not translated) error message. open (IN, $setup) || error(sprintf(gettext("cannot read %s: %s"), $setup, $!)); |