From: Tony Mack <tmack@cs.princeton.edu>
Date: Wed, 4 Mar 2009 17:17:40 +0000 (+0000)
Subject:  no longer assume basedir is our current working dir, get basedir from config
X-Git-Tag: sfa-0.9-0@14641~618
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ccd3fb3d96ca3bd2f43def5e48816aa7c1ce5961;p=sfa.git

 no longer assume basedir is our current working dir, get basedir from config
---

diff --git a/geni/util/hierarchy.py b/geni/util/hierarchy.py
index 5aa3bc9b..cbaa699b 100644
--- a/geni/util/hierarchy.py
+++ b/geni/util/hierarchy.py
@@ -103,7 +103,10 @@ class Hierarchy():
     #
     # @param basedir the base directory to store the hierarchy in
 
-    def __init__(self, basedir="."):
+    def __init__(self, basedir = None):
+        config = Config()
+        if not basedir:
+            basedir = config.GENI_BASE_DIR + os.sep + 'geni' + os.sep
         self.basedir = os.path.join(basedir, "authorities")
 
     ##
@@ -132,7 +135,7 @@ class Hierarchy():
     def auth_exists(self, hrn):
         (directory, gid_filename, privkey_filename, dbinfo_filename) = \
             self.get_auth_filenames(hrn)
-
+    
         return os.path.exists(gid_filename) and \
                os.path.exists(privkey_filename) and \
                os.path.exists(dbinfo_filename)
@@ -185,7 +188,7 @@ class Hierarchy():
 
     def get_auth_info(self, hrn):
         #report.trace("Hierarchy: getting authority: " + hrn)
-
+    
         if not self.auth_exists(hrn):
             raise MissingAuthority(hrn)