cleaning
This commit is contained in:
parent
a1549e0765
commit
cfd32c222d
1 changed files with 16 additions and 17 deletions
|
@ -78,24 +78,23 @@ class RougailUserDataEnvironment:
|
||||||
# carefull, it could be None -> in this case, do nothing
|
# carefull, it could be None -> in this case, do nothing
|
||||||
type_obj = CONVERT_OPTION.get(option_type, {}).get("func")
|
type_obj = CONVERT_OPTION.get(option_type, {}).get("func")
|
||||||
#
|
#
|
||||||
rougail_environment_var = get_rougail_environment_var()
|
|
||||||
option_name = option.path()
|
option_name = option.path()
|
||||||
# this is used only for warning purposes
|
# this is used only for warning purposes
|
||||||
self.unused_environment_var.remove(option_name)
|
if option_name in unused_environment_var:
|
||||||
|
self.unused_environment_var.remove(option_name)
|
||||||
# let's parse the environment variables values
|
# let's parse the environment variables values
|
||||||
if option_name in rougail_environment_var:
|
if ismulti:
|
||||||
if ismulti:
|
option_bash_value = get_rougail_environment_dict()[option_name]
|
||||||
option_bash_value = get_rougail_environment_dict()[option_name]
|
# here we expect the bash option value of a multi to be coma separated:
|
||||||
# here we expect the bash option value of a multi to be coma separated:
|
option_value = option_bash_value.split(",")
|
||||||
option_value = option_bash_value.split(",")
|
if type_obj is not None:
|
||||||
if type_obj is not None:
|
option_value_typed = [type_obj(opt) for opt in option_value]
|
||||||
option_value_typed = [type_obj(opt) for opt in option_value]
|
option.value.set(option_value_typed)
|
||||||
option.value.set(option_value_typed)
|
|
||||||
else:
|
|
||||||
option.value.set(option_value)
|
|
||||||
else:
|
else:
|
||||||
option_bash_value = get_rougail_environment_dict()[option_name]
|
option.value.set(option_value)
|
||||||
if type_obj is not None:
|
else:
|
||||||
option.value.set(type_obj(option_bash_value))
|
option_bash_value = get_rougail_environment_dict()[option_name]
|
||||||
else:
|
if type_obj is not None:
|
||||||
option.value.set(option_bash_value)
|
option.value.set(type_obj(option_bash_value))
|
||||||
|
else:
|
||||||
|
option.value.set(option_bash_value)
|
||||||
|
|
Loading…
Reference in a new issue