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

missed the check if /etc/bdisk/build.ini is specified

Browse Source
This commit is contained in:
brent s. 2017-04-12 12:05:58 -04:00
parent ef8562fb0e
commit 6f3a0f6b86
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

@ -24,7 +24,7 @@ def getHostname():
hostname = platform.node() hostname = platform.node()
return(hostname) return(hostname)


def getConfig(conf_file='/etc/bdisk/build.ini'): 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.
@ -50,6 +50,8 @@ def getConfig(conf_file='/etc/bdisk/build.ini'):
break break
else: else:
conf = conf_file conf = conf_file
else:
conf = conf_file
defconf = os.path.abspath('{0}/../extra/dist.build.ini'.format(os.path.dirname(os.path.realpath(__file__)))) defconf = os.path.abspath('{0}/../extra/dist.build.ini'.format(os.path.dirname(os.path.realpath(__file__))))
if not conf: if not conf:
# okay, so let's check for distributed/"blank" ini's # okay, so let's check for distributed/"blank" ini's