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

Merge pull request #721 from mankyd/log-error

Browse source 
Fix String Formatting Errors
This commit is contained in:
Bruno Binet 2013-02-11 00:27:34 -08:00
commit fdb5759610
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pelican/utils.py
View file

@ -273,7 +273,7 @@ def clean_output_dir(path):
try:
os.remove(path)
except Exception as e:
logger.error("Unable to delete file %s; %e" % path, e)
logger.error("Unable to delete file %s; %s" % (path, str(e)))
return
# remove all the existing content from the output folder
@ -284,13 +284,14 @@ def clean_output_dir(path):
shutil.rmtree(file)
logger.debug("Deleted directory %s" % file)
except Exception as e:
logger.error("Unable to delete directory %s; %e" % file, e)
logger.error("Unable to delete directory %s; %s" % (
file, str(e)))
elif os.path.isfile(file) or os.path.islink(file):
try:
os.remove(file)
logger.debug("Deleted file/link %s" % file)
except Exception as e:
logger.error("Unable to delete file %s; %e" % file, e)
logger.error("Unable to delete file %s; %s" % (file, str(e)))
else:
logger.error("Unable to delete %s, file type unknown" % file)