Skip to content

Commit 475104c

Browse files
committed
Fix use_global_config and use_env_var for options with unspecified defaults.
Setting up default_conda_prefix in ~/.planemo.yml was not being respected.
1 parent 9636682 commit 475104c

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

planemo/config.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,12 @@ def planemo_option(*args, **kwargs):
7474
use_global_config = kwargs.pop("use_global_config", False)
7575
use_env_var = kwargs.pop("use_env_var", False)
7676

77-
if "default" in kwargs:
77+
default_specified = "default" in kwargs
78+
default = None
79+
if default_specified:
7880
default = kwargs.pop("default")
81+
82+
if default_specified or use_global_config or use_env_var:
7983
outer_callback = kwargs.pop("callback", None)
8084

8185
def callback(ctx, param, value):
@@ -92,6 +96,8 @@ def callback(ctx, param, value):
9296
return result
9397

9498
kwargs["callback"] = callback
99+
100+
if default_specified:
95101
kwargs["default"] = None
96102

97103
if use_env_var:

0 commit comments

Comments
 (0)