summaryrefslogtreecommitdiff
path: root/IkiWiki.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-02-09 13:47:03 -0400
committerJoey Hess <joey@kitenet.net>2011-02-09 13:47:03 -0400
commit230b7d4d6e1a87bc5e18eb6c6155cc45957cff70 (patch)
tree76ab61ce8ba208b98d601f0f72367ebbded8add2 /IkiWiki.pm
parentacd10522980712a91b8a801e974240ff90af829e (diff)
parentdff44e4a6d98cccd2b4af56397a80dc127b0242b (diff)
Merge remote branch 'smcv/transient-relative-api'
Diffstat (limited to 'IkiWiki.pm')
-rw-r--r--IkiWiki.pm16
1 files changed, 11 insertions, 5 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 799236f35..7d1f5c401 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -810,17 +810,23 @@ sub srcfile ($;$) {
return (srcfile_stat(@_))[0];
}
-sub add_underlay ($) {
+sub add_literal_underlay ($) {
my $dir=shift;
- if ($dir !~ /^\//) {
- $dir="$config{underlaydirbase}/$dir";
- }
-
if (! grep { $_ eq $dir } @{$config{underlaydirs}}) {
unshift @{$config{underlaydirs}}, $dir;
}
+}
+
+sub add_underlay ($) {
+ my $dir = shift;
+
+ if ($dir !~ /^\//) {
+ $dir="$config{underlaydirbase}/$dir";
+ }
+ add_literal_underlay($dir);
+ # why does it return 1? we just don't know
return 1;
}