From: Tony Mack <tmack@cs.princeton.edu>
Date: Mon, 4 May 2009 22:57:46 +0000 (+0000)
Subject: add old path to keyconvert serach path
X-Git-Tag: sfa-0.9-0@14641~413
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0c7d4e1849a7c2fe235bad1318da7e5e8bbb70e1;p=sfa.git

add old path to keyconvert serach path
---

diff --git a/geni/gimport.py b/geni/gimport.py
index fd886890..02865e0b 100755
--- a/geni/gimport.py
+++ b/geni/gimport.py
@@ -58,7 +58,8 @@ loaded = False
 default_path = "/usr/shre/keyconvert/" + keyconvert
 cwd = os.path.dirname(os.path.abspath(__file__))
 alt_path = os.sep.join(cwd.split(os.sep)[:-1] + ['keyconvert', 'keyconvert'])
-files = [default_path, alt_path]
+geni_path = config.GENI_BASE_DIR + os.sep + "keyconvert/keyconvert"
+files = [default_path, alt_path, geni_path]
 for path in files:
     if os.path.isfile(path):
         keyconvert_fn = path