move trusted_roots directory to /etc/geni

[sfa.git] / geni / util / trustedroot.py

diff --git a/geni/util/trustedroot.py b/geni/util/trustedroot.py
index c757907..7f9f738 100644 (file)
--- a/geni/util/trustedroot.py
+++ b/geni/util/trustedroot.py
@@ -7,15 +7,15 @@ class TrustedRootList():
     def __init__(self, dir=None):
         if not dir:
             config = Config()
-            self.basedir = config.path + os.sep + 'trusted_roots'
-        else:
-            self.basedir = dir
+            dir = config.config_path + os.sep + 'trusted_roots'
+        self.basedir = dir
+        
         # create the directory to hold the files
         try:
-            os.makedirs(self.basedir)\r
-        # if the path already exists then pass\r
-        except OSError, (errno, strerr):\r
-            if errno == 17:\r
+            os.makedirs(self.basedir)
+        # if the path already exists then pass
+        except OSError, (errno, strerr):
+            if errno == 17:
                 pass
 
     def add_gid(self, gid):