diff options
| author |  David Leverton <levertond@googlemail.com>
| 2014-08-27 21:08:18 +0100 |
|---|---|---|
| committer | David Leverton <levertond@googlemail.com>
| 2014-08-27 21:08:18 +0100 |
| commit | d07fa128c2e34070e3abff1ae530793c0100315c (patch) | |
| tree | 4daff494ead851c85f5e3db548175a0d4b3454cf | |
| parent | c4827c20936e38d37c428b599d9270f5b2236fec (diff) | |
| download | paludis-d07fa128c2e34070e3abff1ae530793c0100315c.tar.gz paludis-d07fa128c2e34070e3abff1ae530793c0100315c.tar.xz | |
Fix tests for separate src/build dirs
The previous logic would pick up (srcdir)/ebuild/utils/dohard before
(builddir)/ebuild/utils/4/dohard, breaking e_repository_TEST_4.
| -rwxr-xr-x | paludis/repositories/e/ebuild/ebuild.bash | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash index 09acc179a..a88554b1c 100755 --- a/paludis/repositories/e/ebuild/ebuild.bash +++ b/paludis/repositories/e/ebuild/ebuild.bash @@ -54,17 +54,12 @@ ebuild_sanitise_envvars() # See ticket:374. export PATH="/usr/bin:/usr/sbin:/bin:/sbin${PATH:+:${PATH}}" - # Automake likes to scatter our utilities over two directories. - if [[ -n "${PALUDIS_EBUILD_DIR_FALLBACK}" ]] ; then - export PATH="${PALUDIS_EBUILD_DIR_FALLBACK}/utils:${PATH}" - for p in ${PALUDIS_UTILITY_PATH_SUFFIXES} ; do - export PATH="${PALUDIS_EBUILD_DIR_FALLBACK}/utils/${p}:${PATH}" - done - fi - export PATH="${PALUDIS_EBUILD_DIR}/utils:${PATH}" + # Automake likes to scatter our utilities over two directories. + [[ -n "${PALUDIS_EBUILD_DIR_FALLBACK}" ]] && export PATH="${PALUDIS_EBUILD_DIR_FALLBACK}/utils:${PATH}" for p in ${PALUDIS_UTILITY_PATH_SUFFIXES} ; do export PATH="${PALUDIS_EBUILD_DIR}/utils/${p}:${PATH}" + [[ -n "${PALUDIS_EBUILD_DIR_FALLBACK}" ]] && export PATH="${PALUDIS_EBUILD_DIR_FALLBACK}/utils/${p}:${PATH}" done unset GZIP BZIP BZIP2 CDPATH GREP_OPTIONS GREP_COLOR GLOBIGNORE |