github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the check if 'output_path' is inside of 'path'

Browse source 
The check compares path names rather than strings and ensures that
a content path is not located inside an output path during the erasing
This commit is contained in:
Oleksii Tsvietnov 2017-04-16 23:38:55 +02:00
commit df231b595c
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pelican/__init__.py
View file

@ -162,8 +162,16 @@ class Pelican(object):
# erase the directory if it is not the source and if that's
# explicitly asked
if (self.delete_outputdir and not
os.path.realpath(self.path).startswith(self.output_path)):
if (self.delete_outputdir and
# Compares two dirs similar to os.path.commonpath() from Py3.5+
# All paths at this point are already full and normalized.
# So, we can omit unnecessary checks
os.path.join(os.path.sep,
*(_subdir1 for _subdir1, _subdir2 in
zip(self.path.split(os.path.sep),
self.output_path.split(os.path.sep))
if _subdir1 == _subdir2
)) != self.output_path):
clean_output_dir(self.output_path, self.output_retention)
for p in generators: