X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=geni%2Futil%2Fconfig.py;h=e99674cf4200e999d5f97782e8dafdeb495b3357;hb=5ba1f67fd297c7628459e0f5fa3068618f64c0e3;hp=6ce9e4e8d51abe480ccfa20f1ced788430c348b5;hpb=1382a515f18d2df42facdcffcc7e8f2651f9dc42;p=sfa.git diff --git a/geni/util/config.py b/geni/util/config.py index 6ce9e4e8..e99674cf 100644 --- a/geni/util/config.py +++ b/geni/util/config.py @@ -17,12 +17,6 @@ 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: @@ -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 - files = [file, alt_file, myplc_file] + files = [file, alt_file, geni_file] for file in files: try: