diff options
| -rw-r--r-- | subr/pkg_setup_env.subr | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/subr/pkg_setup_env.subr b/subr/pkg_setup_env.subr index 72314edc..0f16815c 100644 --- a/subr/pkg_setup_env.subr +++ b/subr/pkg_setup_env.subr @@ -57,11 +57,16 @@ pkg_setup_env() { fi; fi; for __ in $(set); do - if [ -n "${_pkg_name_parent_uc}" ]\ - && [ "${__#PKG_${_pkg_name_parent_uc}}" != "${__}" ]; then - _log_env_vars="${_log_env_vars:+${_log_env_vars} }${__%%=*}"; - elif [ "${__#PKG_${_pkg_name_uc}}" != "${__}" ]; then - _log_env_vars="${_log_env_vars:+${_log_env_vars} }${__%%=*}"; + if [ -n "${_pkg_name_parent_uc}" ]; then + if [ "${__#PKG_${_pkg_name_uc}}" != "${__}" ]\ + || [ "${__#PKG_${_pkg_name_parent_uc}}" != "${__}" ]; then + _log_env_vars="${_log_env_vars:+${_log_env_vars} }${__%%=*}"; + fi; + else + if [ "${__#PKG_${_pkg_name_uc}}" != "${__}" ]\ + && [ "${__#*_FLAVOUR_*}" = "${__}" ]; then + _log_env_vars="${_log_env_vars:+${_log_env_vars} }${__%%=*}"; + fi; fi; done; if [ -n "${_log_env_vars}" ]; then |