diff options
Diffstat (limited to 'g_common/g_common.py')
| -rw-r--r-- | g_common/g_common.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/g_common/g_common.py b/g_common/g_common.py index 73f3e86..c671b5c 100644 --- a/g_common/g_common.py +++ b/g_common/g_common.py @@ -23,7 +23,7 @@ def read_config(conf_file,defaults={}): #returns dict of key=value config file def read_driver_config(driver_name): - conffile=os.path.join('/etc/g-common',driver_name+'.cfg') + conffile=os.path.join(settings.GLOBAL_CONF_DIR,settings.DRIVER_DIR,driver_name+'.cfg') return read_config(conffile,{ #'name':None, #'executable':None, @@ -46,7 +46,7 @@ def action_sync(repo_location,driver,remote_uri): remote_uri=repo_conf['uri'] #todo write repo.cfg - cfg_file=open(os.path.join(repo_location,MYDIR,"repo.cfg"),"w") + cfg_file=open(os.path.join(repo_location,settings.MYDIR,"repo.cfg"),"w") cfg_file.write('driver='+driver) cfg_file.write('uri='+remote_uri) cfg_file.close() @@ -80,7 +80,7 @@ def generate_tree(repo_location): repo_conf=read_repo_config(repo_location) driver_conf=read_driver_config(repo_conf['driver']) - ebuild_file=COMMON_EBUILD_FILE #get from settings + ebuild_file=settings.COMMON_EBUILD_FILE #get from settings packages_list_pipe=subprocess.Popen(fixme,shell=True,stdout=subprocess.PIPE) os.waitpid(process.pid,0) |