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 (parent:
1382a51
)
fix bug
author
Tony Mack
<tmack@cs.princeton.edu>
Fri, 1 May 2009 01:44:59 +0000
(
01:44
+0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Fri, 1 May 2009 01:44:59 +0000
(
01:44
+0000)
geni/util/config.py
patch
|
blob
|
history
diff --git
a/geni/util/config.py
b/geni/util/config.py
index
6ce9e4e
..
e99674c
100644
(file)
--- a/
geni/util/config.py
+++ b/
geni/util/config.py
@@
-17,12
+17,6
@@
import os
import sys
import os
import sys
-# If we have been checked out into a directory at the same
-# level as myplc, where plc_config.py lives. If we are in a
-# MyPLC environment, plc_config.py has already been installed
-# in site-packages.
-myplc = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + \
- os.sep + "myplc"
geni = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))+ os.sep + "geni"
class Config:
geni = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))+ os.sep + "geni"
class Config:
@@
-39,7
+33,7
@@
class Config:
filename = file.split(os.sep)[-1]
alt_file = path + os.sep + 'util' + os.sep + filename
geni_file = geni + os.sep + 'util' + os.sep + filename
filename = file.split(os.sep)[-1]
alt_file = path + os.sep + 'util' + os.sep + filename
geni_file = geni + os.sep + 'util' + os.sep + filename
- files = [file, alt_file,
myplc
_file]
+ files = [file, alt_file,
geni
_file]
for file in files:
try:
for file in files:
try: