projects
/
pithos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c19fc46
)
Load settings.local only if present.
author
Antony Chazapis
<chazapis@gmail.com>
Mon, 28 Nov 2011 09:27:30 +0000
(11:27 +0200)
committer
Antony Chazapis
<chazapis@gmail.com>
Mon, 28 Nov 2011 09:27:30 +0000
(11:27 +0200)
pithos/settings.py
patch
|
blob
|
history
diff --git
a/pithos/settings.py
b/pithos/settings.py
index
f5f2dd8
..
d26da09
100644
(file)
--- a/
pithos/settings.py
+++ b/
pithos/settings.py
@@
-33,7
+33,7
@@
from glob import glob
from os import umask
-from os.path import abspath, dirname, join
+from os.path import abspath, dirname, exists, join
PROJECT_PATH = dirname(abspath(__file__))
@@
-43,4
+43,8
@@
conffiles = glob(join(PROJECT_PATH, 'settings.d', '*.conf'))
for conf in sorted(conffiles):
execfile(conf)
-execfile(join(PROJECT_PATH, 'settings.local'))
+
+conf = join(PROJECT_PATH, 'settings.local')
+
+if exists(conf):
+ execfile(conf)