further fixes for pip support

saga-project · Jul 7, 2012 · 6868cdf · 6868cdf
1 parent 998ecde
commit 6868cdf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.4.80
+0.4.84
diff --git a/bigjob/__init__.py b/bigjob/__init__.py
@@ -17,7 +17,7 @@
         _conf_file = os.path.join(sys.prefix, _CONFIG_FILE)
 
 
-    print "using conf file: " + str(_conf_file)
+    #print "using conf file: " + str(_conf_file)
 
     _config = ConfigParser.ConfigParser()
     _config.read(_conf_file)
@@ -80,6 +80,9 @@
 import socket
 try:
     fn = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", 'VERSION')
+    if not os.path.exists(fn):
+        fn = os.path.join(sys.prefix, 'VERSION')
+    #print "Open Version file: " + str(fn)
     version = open(fn).read().strip()
     logger.info("Loading BigJob version: " + version + " on " + socket.gethostname())
 except IOError:

diff --git a/bigjob/bigjob_agent.py b/bigjob/bigjob_agent.py
@@ -67,11 +67,9 @@ def __init__(self, args):
         self.restarted = {}
 
         # read config file
-        # conf_file = os.path.dirname(args[0]) + "/" + CONFIG_FILE
-        # conf_file = os.path.dirname(os.path.abspath( __file__ )) + "/" + CONFIG_FILE
         conf_file = os.path.dirname(os.path.abspath( __file__ )) + "/../" + CONFIG_FILE
         if not os.path.exists(conf_file):
-            _conf_file = os.path.join(sys.prefix, CONFIG_FILE)
+            conf_file = os.path.join(sys.prefix, CONFIG_FILE)
 
         config = ConfigParser.ConfigParser()
         logging.debug ("read configfile: " + conf_file)