diff options
| author | Joey Hess <joey@kitenet.net> | 2010-07-18 17:30:46 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-07-18 17:38:35 -0400 |
| commit | e674bb1445378ce43ae60720e42d6c418270001a (patch) | |
| tree | fc505247b46f916eaa7a5d1fa319ea156fda9928 /debian | |
| parent | 1dbb2632ef5f7eaa1f5745d587b1373b45b09e56 (diff) | |
| download | ikiwiki-e674bb1445378ce43ae60720e42d6c418270001a.tar ikiwiki-e674bb1445378ce43ae60720e42d6c418270001a.tar.gz | |
fix other 2 cases of conflicting destdir files
Cleanly fixed case where destdir file failed to be written because there
was a directory with the same name. This can be detected with no extra
system calls, and dealt with by finding all pages that wrote files
inside the directory, and removing them and the directory.
The other, inverse case would be expensive to detect in will_render,
since it would need to check each parent directory of the file to see
if the directory is really a conflicting file. But prep_writefile
already does a similar scan for symlinks in the path, so I added code
there to remove the conflicting file. This fix assumes that the file
is written using writefile, and not some other means (but using other means
would be a security hole too, so hopefully nothing does).
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index bb9a43692..21b5d01fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low * po: needstranslation() pagespec can have a percent specified. * Drop Cache-Control must-revalidate (Firefox 3.5.10 does not seem to have the caching problem that was added to work around). Closes: #588623 + * Made much more robust in cases where multiple source files produce + conflicting files/directories in the destdir. -- Joey Hess <joeyh@debian.org> Mon, 05 Jul 2010 13:59:42 -0400 |