aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki.pm
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2014-06-24 16:02:26 +0100
committerChristopher Baines <mail@cbaines.net>2020-05-14 19:07:21 +0100
commit9d9c4844be96b7ae8ce78287951118f1af2c05aa (patch)
tree5c90c6e39962b030c333eb4d558841c496607029 /IkiWiki.pm
parentcd58acba564b671f2ffb4f29c4b49f7031bfeae3 (diff)
downloadikiwiki-git-annex-album-2-rebased.tar
ikiwiki-git-annex-album-2-rebased.tar.gz
Make ignoring symlinks configurablegit-annex-album-2-rebased
Diffstat (limited to 'IkiWiki.pm')
-rw-r--r--IkiWiki.pm9
1 files changed, 8 insertions, 1 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index efb48293a..809d31f75 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -544,6 +544,13 @@ sub getsetup () {
safe => 0,
rebuild => 0,
},
+ allow_symlinks => {
+ type => "boolean",
+ default => 0,
+ description => "allow symlinks in the repository",
+ safe => 0,
+ rebuild => 0,
+ },
cookiejar => {
type => "string",
default => { file => "$ENV{HOME}/.ikiwiki/cookies" },
@@ -999,7 +1006,7 @@ sub readfile ($;$$) {
my $binary=shift;
my $wantfd=shift;
- if (-l $file) {
+ if (!$config{allow_symlinks} and -l $file) {
error("cannot read a symlink ($file)");
}