urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow underlaydir to be overridden without messing up inclusion of other underlays via add_underlay.

master
Joey Hess 2009-05-07 14:02:52 -04:00
parent 9f5f5543bf
commit 4291f2e3d7
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IkiWiki.pm
View File

@ -157,6 +157,13 @@ sub getsetup () {
safe => 0, # path safe => 0, # path
rebuild => 0, rebuild => 0,
}, },
underlaydirbase => {
type => "internal",
default => "$installdir/share/ikiwiki",
description => "parent directory containing additional underlays",
safe => 0,
rebuild => 0,
},
wrappers => { wrappers => {
type => "internal", type => "internal",
default => [], default => [],
@ -715,7 +722,7 @@ sub add_underlay ($) {
my $dir=shift; my $dir=shift;
if ($dir !~ /^\//) { if ($dir !~ /^\//) {
$dir="$config{underlaydir}/../$dir"; $dir="$config{underlaydirbase}/$dir";
} }
if (! grep { $_ eq $dir } @{$config{underlaydirs}}) { if (! grep { $_ eq $dir } @{$config{underlaydirs}}) {

2
debian/changelog vendored
View File

@ -2,6 +2,8 @@ ikiwiki (3.13) UNRELEASED; urgency=low
* ikiwiki-transition: If passed a nonexistant srcdir, or one not * ikiwiki-transition: If passed a nonexistant srcdir, or one not
containing .ikiwiki, abort with an error rather than creating it. containing .ikiwiki, abort with an error rather than creating it.
* Allow underlaydir to be overridden without messing up inclusion
of other underlays via add_underlay.
-- Joey Hess <joeyh@debian.org> Wed, 06 May 2009 20:45:44 -0400 -- Joey Hess <joeyh@debian.org> Wed, 06 May 2009 20:45:44 -0400