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 branch 'master' of github.com:ametaireau/pelican

Browse source
This commit is contained in:
Alexis Metaireau 2011-06-12 22:29:31 +02:00
commit d698ca3899
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pelican/__init__.py
View file

@ -24,7 +24,7 @@ class Pelican(object):
' (see pelican --help for more information)')
if self.path.endswith('/'):
self.path = path[:-1]
self.path = self.path[:-1]
# define the default settings
self.settings = settings

6
pelican/settings.py
View file

@ -74,5 +74,11 @@ def read_settings(filename):
else:
log.warn("LOCALE option doesn't contain a correct value")
# Make the paths relative to the settings file
for path in ['PATH']:
if path in context:
if not os.path.isabs(context[path]):
context[path] = os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(filename), context[path])))
# set the locale
return context