diff options
| author |   Paul Varner <fuzzyray@gentoo.org> | 2011-08-24 12:28:06 -0500 |
|---|---|---|
| committer | Paul Varner <fuzzyray@gentoo.org> | 2011-08-24 12:28:06 -0500 |
| commit | 6edc15a5690a3c26a3c530669a922e01f50ab830 (patch) | |
| tree | 9c06a98a9a34eaad7145b3b09a950a3706917445 /bin | |
| parent | Fix missing parenthises in euse. Bug 376393 (diff) | |
| download | gentoolkit-6edc15a5690a3c26a3c530669a922e01f50ab830.tar.gz gentoolkit-6edc15a5690a3c26a3c530669a922e01f50ab830.tar.bz2 gentoolkit-6edc15a5690a3c26a3c530669a922e01f50ab830.zip | |
Fix traversal of cascading profiles by euse (Bug 379559).
Thanks to Ian Abbot for the patch!
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/euse | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -439,7 +439,6 @@ traverse_profile() { curdir="${2:-$(get_real_path ${MAKE_PROFILE_PATH})}" - [[ -f "${curdir}/${1}" ]] && rvalue="${curdir}/${1} ${rvalue}" if [[ -f "${curdir}/parent" ]]; then for parent in $(egrep -v '(^#|^ *$)' ${curdir}/parent); do # Bug 231394, handle parent path being absolute @@ -448,9 +447,10 @@ traverse_profile() { else pdir="$(get_real_path ${curdir}/${parent})" fi - rvalue="$(traverse_profile ${1} ${pdir}) ${rvalue}" + rvalue="${rvalue} $(traverse_profile ${1} ${pdir})" done fi + [[ -f "${curdir}/${1}" ]] && rvalue="${rvalue} ${curdir}/${1}" echo "${rvalue}" } # }}} |