aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin
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/Plugin
parentacd10522980712a91b8a801e974240ff90af829e (diff)
parentdff44e4a6d98cccd2b4af56397a80dc127b0242b (diff)
downloadikiwiki-230b7d4d6e1a87bc5e18eb6c6155cc45957cff70.tar
ikiwiki-230b7d4d6e1a87bc5e18eb6c6155cc45957cff70.tar.gz
Merge remote branch 'smcv/transient-relative-api'
Diffstat (limited to 'IkiWiki/Plugin')
-rw-r--r--IkiWiki/Plugin/transient.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/transient.pm b/IkiWiki/Plugin/transient.pm
index c482b8552..9811aa010 100644
--- a/IkiWiki/Plugin/transient.pm
+++ b/IkiWiki/Plugin/transient.pm
@@ -25,10 +25,10 @@ sub getsetup () {
our $transientdir;
sub checkconfig () {
- eval q{use Cwd 'abs_path'};
- error($@) if $@;
- $transientdir = abs_path($config{wikistatedir})."/transient";
- add_underlay($transientdir);
+ $transientdir = $config{wikistatedir}."/transient";
+ # add_underlay treats relative underlays as relative to the installed
+ # location, not the cwd. That's not what we want here.
+ IkiWiki::add_literal_underlay($transientdir);
}
sub change (@) {