Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

[plcapi.git] / PLC / Config.py

diff --git a/PLC/Config.py b/PLC/Config.py
index 7d666b3..693ba22 100644 (file)
--- a/PLC/Config.py
+++ b/PLC/Config.py
@@ -6,7 +6,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #
-# $Id$
+# $Id: Config.py 5574 2007-10-25 20:33:17Z thierry $
 #
 
 import os
@@ -35,11 +35,11 @@ class Config:
         except:
             # Try myplc directory
             try:
-                execfile(file, self.__dict__)
+                execfile(myplc + os.sep + "plc_config", self.__dict__)
             except:
                 raise PLCAPIError("Could not find plc_config in " + \
                                   file + ", " + \
-                                  myplc + "plc_config")
+                                  myplc + os.sep + "plc_config")
 
 class XMLConfig:
     """
@@ -64,7 +64,7 @@ class XMLConfig:
             except:
                 raise PLCAPIError("Could not find plc_config.xml in " + \
                                   file + ", " + \
-                                  myplc + "plc_config.xml")
+                                  myplc + os.sep + "plc_config.xml")
 
         for (category, variablelist) in cfg.variables().values():
             for variable in variablelist.values():