Changeset 20:bf238ca0c37f in mailjam for mailjam/config.py

Timestamp:

May 22, 2012, 1:28:15 PM (12 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Fixed multiple bugs found while doing manual tests of both the server and
MTA client. All of those bugs are related to how configuration files are
loaded.

File:

• mailjam/config.py (modified) (3 diffs)

mailjam/config.py

@@ -42 +42 @@
                 'mailing_lists', 'members']
     
-    def validate_configfile(self):        
+    def validate_configfile(self):
         if self.configfile:
+            # ensure we have the full path to the provided file
+            self.configfile = os.path.join(os.path.dirname(__file__),
+                                           self.configfile)
             if not os.path.exists(self.configfile):
                 # the file does not exist, so we override it with None,
@@ -49 +52 @@
                 # config file on the usual places
                 self.configfile = None
+            else:
+                return self.configfile
             
         if not self.configfile:
@@ -56 +61 @@
                     self.configfile = full_path
                     return full_path
-                
+
         # if we reach here, self.configfile will be still None, no valid
         # config files were found, and so we raise an exception