diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-03-08 20:24:15 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-03-08 20:24:15 +0000 |
| commit | 3eac319c2d53b1e5b2ba5a673efcd9f266ff6b8e (patch) | |
| tree | 692f53282aba68aba9b8c194c4336436fc36ca94 | |
| parent | 53e0e16cb86e2034f177e456a061ab81519e2f11 (diff) | |
| download | midipix_build-3eac319c2d53b1e5b2ba5a673efcd9f266ff6b8e.tar.bz2 midipix_build-3eac319c2d53b1e5b2ba5a673efcd9f266ff6b8e.tar.xz | |
subr/pkg_setup_env.subr: don't log variables for flavoured packages when building an unflavoured package.
| -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 |