Changeset 14171 for trunk/sara_cmt/sara_cmt/settings.py

Timestamp:

05/14/12 16:54:33 (12 years ago)

Author:

ramonb

Message:

sara_cmt/bin/cmt,
sara_cmt/sara_cmt/logger.py,
sara_cmt/sara_cmt/settings.py:

• apply same ETC_PREPEND location as in setup.py to source code
• see #14

File:

• trunk/sara_cmt/sara_cmt/settings.py (modified) (2 diffs)

trunk/sara_cmt/sara_cmt/settings.py

@@ -4 +4 @@
 from socket import gethostbyname_ex
 
+if site.sys.prefix in [ '/usr', '/' ]:
+    ETC_PREPEND = ''
+else:
+    ETC_PREPEND = site.sys.prefix
+
 # Path's customizable through virtualenv
-sample_configfile = '%s/etc/cmt/cmt.conf.sample' % site.sys.prefix
-configfile = '%s/etc/cmt/cmt.conf' % site.sys.prefix
+sample_configfile = '%s/etc/cmt/cmt.conf.sample' % ETC_PREPEND
+configfile = '%s/etc/cmt/cmt.conf' % ETC_PREPEND
 
 def count_configlines( filename ):
@@ -248 +253 @@
 #TODO: think about a (better) way to make this dynamic:
 #TODO: get this out of the settings.py, since it should be in the client config
-CMT_TEMPLATES_DIR = '%s/etc/cmt/templates' % site.sys.prefix
+CMT_TEMPLATES_DIR = '%s/etc/cmt/templates' % ETC_PREPEND
 
 # Templates for the CMT web-frontend.