r00t2/bdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

and adding a tweak to check the pwd parent for the project dir

Browse Source
This commit is contained in:
brent s. 2017-04-11 02:07:52 -04:00
parent 06c8924367
commit 6760b46c5d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bdisk/host.py
View File

@ -28,6 +28,7 @@ def getConfig(conf_file='/etc/bdisk/build.ini'):
conf = False conf = False
# define some defailt conf paths in case we're installed by # define some defailt conf paths in case we're installed by
# a package manager. in order of the paths we should search. # a package manager. in order of the paths we should search.
currentdir = os.path.abspath('{0}/../extra/dist.build.ini'.format(os.path.dirname(os.path.realpath(__file__))))
default_conf_paths = ['/etc/bdisk/build.ini', default_conf_paths = ['/etc/bdisk/build.ini',
'/usr/share/bdisk/build.ini', '/usr/share/bdisk/build.ini',
'/usr/share/bdisk/extra/build.ini', '/usr/share/bdisk/extra/build.ini',
@ -36,7 +37,8 @@ def getConfig(conf_file='/etc/bdisk/build.ini'):
'/usr/local/share/docs/bdisk/build.ini', '/usr/local/share/docs/bdisk/build.ini',
'/opt/dev/bdisk/build.ini', '/opt/dev/bdisk/build.ini',
'/opt/dev/bdisk/extra/build.ini', '/opt/dev/bdisk/extra/build.ini',
'/opt/dev/bdisk/extra/dist.build.ini'] '/opt/dev/bdisk/extra/dist.build.ini',
currentdir]
# if we weren't given one/using the default... # if we weren't given one/using the default...
if conf_file == '/etc/bdisk/build.ini': if conf_file == '/etc/bdisk/build.ini':
if not os.path.isfile(conf_file): if not os.path.isfile(conf_file):