From: Tony Mack <tmack@cs.princeton.edu>
Date: Wed, 20 May 2009 19:17:48 +0000 (+0000)
Subject: fix 'authorities' path
X-Git-Tag: sfa-0.9-0@14641~376
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=aec8da1de7e27d748128ade4fc1cac7799fc3f27;p=sfa.git

fix 'authorities' path
---

diff --git a/geni/util/hierarchy.py b/geni/util/hierarchy.py
index 03d71462..742ab8bf 100644
--- a/geni/util/hierarchy.py
+++ b/geni/util/hierarchy.py
@@ -104,11 +104,10 @@ class Hierarchy():
     # @param basedir the base directory to store the hierarchy in
 
     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")
-
+            config = Config()
+            basedir = config.basepath + os.sep + "authorities"
+        self.basedir = basedir
     ##
     # Given a hrn, return the filenames of the GID, private key, and dbinfo
     # files.