diff options
| author | Simon McVittie <smcv@debian.org> | 2012-04-07 17:52:29 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2012-04-07 17:52:29 +0100 |
| commit | 5674e7fc1273800554c23ad6194e8a06dee851ae (patch) | |
| tree | c5ae178e0a15350dc44507c5612bd58dae98e2f4 /IkiWiki/Plugin/aggregate.pm | |
| parent | f5f41fa59af064ce3d5e038154950aefdc8d6f65 (diff) | |
| download | ikiwiki-5674e7fc1273800554c23ad6194e8a06dee851ae.tar ikiwiki-5674e7fc1273800554c23ad6194e8a06dee851ae.tar.gz | |
prune: do not prune beyond an optional base directory, and add a test
Previously, prune("wiki/srcdir/sandbox/test.mdwn") could delete srcdir
or even wiki, if they happened to be empty. This is rarely what you
want: there's usually some base directory (destdir, srcdir, transientdir
or another subdirectory of wikistatedir) beyond which you do not want to
delete.
Diffstat (limited to 'IkiWiki/Plugin/aggregate.pm')
| -rw-r--r-- | IkiWiki/Plugin/aggregate.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 5e22609c9..83bd670cb 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -201,7 +201,7 @@ sub migrate_to_internal { if (-e $oldoutput) { require IkiWiki::Render; debug("removing output file $oldoutput"); - IkiWiki::prune($oldoutput); + IkiWiki::prune($oldoutput, $config{destdir}); } } |