git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e1c38c5
)
add old path to keyconvert serach path
author
Tony Mack
<tmack@cs.princeton.edu>
Mon, 4 May 2009 22:57:46 +0000
(22:57 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Mon, 4 May 2009 22:57:46 +0000
(22:57 +0000)
geni/gimport.py
patch
|
blob
|
history
diff --git
a/geni/gimport.py
b/geni/gimport.py
index
fd88689
..
02865e0
100755
(executable)
--- 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'])
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
for path in files:
if os.path.isfile(path):
keyconvert_fn = path