diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2011-11-07 19:28:05 +0100 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2011-11-07 19:28:05 +0100 |
| commit | 1a2b3bdd4791533a424279b806373b1797b090ad (patch) | |
| tree | cf5e277bec6797cec237e86f90d955bd495681f6 | |
| parent | a0961708ced50c90497811058eda6f4513d2986d (diff) | |
| download | portage-1a2b3bdd4791533a424279b806373b1797b090ad.tar.gz portage-1a2b3bdd4791533a424279b806373b1797b090ad.tar.bz2 portage-1a2b3bdd4791533a424279b806373b1797b090ad.zip | |
Avoid initial spaces in some variables.
| -rwxr-xr-x | bin/ebuild.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 5648a9762..8ca7a4121 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -289,11 +289,11 @@ inherit() { # If each var has a value, append it to the global variable E_* to # be applied after everything is finished. New incremental behavior. - [ "${IUSE+set}" = set ] && export E_IUSE="${E_IUSE} ${IUSE}" - [ "${REQUIRED_USE+set}" = set ] && export E_REQUIRED_USE="${E_REQUIRED_USE} ${REQUIRED_USE}" - [ "${DEPEND+set}" = set ] && export E_DEPEND="${E_DEPEND} ${DEPEND}" - [ "${RDEPEND+set}" = set ] && export E_RDEPEND="${E_RDEPEND} ${RDEPEND}" - [ "${PDEPEND+set}" = set ] && export E_PDEPEND="${E_PDEPEND} ${PDEPEND}" + [ "${IUSE+set}" = set ] && export E_IUSE+="${E_IUSE:+ }${IUSE}" + [ "${REQUIRED_USE+set}" = set ] && export E_REQUIRED_USE+="${E_REQUIRED_USE:+ }${REQUIRED_USE}" + [ "${DEPEND+set}" = set ] && export E_DEPEND+="${E_DEPEND:+ }${DEPEND}" + [ "${RDEPEND+set}" = set ] && export E_RDEPEND+="${E_RDEPEND:+ }${RDEPEND}" + [ "${PDEPEND+set}" = set ] && export E_PDEPEND+="${E_PDEPEND:+ }${PDEPEND}" [ "${B_IUSE+set}" = set ] && IUSE="${B_IUSE}" [ "${B_IUSE+set}" = set ] || unset IUSE @@ -544,11 +544,11 @@ if ! has "$EBUILD_PHASE" clean cleanrm ; then fi # add in dependency info from eclasses - IUSE="${IUSE} ${E_IUSE}" - DEPEND="${DEPEND} ${E_DEPEND}" - RDEPEND="${RDEPEND} ${E_RDEPEND}" - PDEPEND="${PDEPEND} ${E_PDEPEND}" - REQUIRED_USE="${REQUIRED_USE} ${E_REQUIRED_USE}" + IUSE+="${IUSE:+ }${E_IUSE}" + DEPEND+="${DEPEND:+ }${E_DEPEND}" + RDEPEND+="${RDEPEND:+ }${E_RDEPEND}" + PDEPEND+="${PDEPEND:+ }${E_PDEPEND}" + REQUIRED_USE+="${REQUIRED_USE:+ }${E_REQUIRED_USE}" unset ECLASS E_IUSE E_REQUIRED_USE E_DEPEND E_RDEPEND E_PDEPEND \ __INHERITED_QA_CACHE |