1 |
commit: 7bf14ebd3feb75c368f32e06e1ac34e9ccbd35ed |
2 |
Author: James Le Cuirot <chewi <AT> aura-online <DOT> co <DOT> uk> |
3 |
AuthorDate: Sat Apr 28 16:33:07 2012 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 28 20:17:37 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7bf14ebd |
7 |
|
8 |
ebuild.sh: source /etc/portage/env scripts after /etc/portage/bashrc |
9 |
|
10 |
This will fix bug #413895. |
11 |
|
12 |
--- |
13 |
bin/ebuild.sh | 22 ++++++++++++---------- |
14 |
1 files changed, 12 insertions(+), 10 deletions(-) |
15 |
|
16 |
diff --git a/bin/ebuild.sh b/bin/ebuild.sh |
17 |
index b1d1df1..173865c 100755 |
18 |
--- a/bin/ebuild.sh |
19 |
+++ b/bin/ebuild.sh |
20 |
@@ -375,7 +375,19 @@ source_all_bashrcs() { |
21 |
for x in "${path_array[@]}" ; do |
22 |
[ -f "$x/profile.bashrc" ] && qa_source "$x/profile.bashrc" |
23 |
done |
24 |
+ fi |
25 |
+ |
26 |
+ if [ -r "${PORTAGE_BASHRC}" ] ; then |
27 |
+ if [ "$PORTAGE_DEBUG" != "1" ] || [ "${-/x/}" != "$-" ]; then |
28 |
+ source "${PORTAGE_BASHRC}" |
29 |
+ else |
30 |
+ set -x |
31 |
+ source "${PORTAGE_BASHRC}" |
32 |
+ set +x |
33 |
+ fi |
34 |
+ fi |
35 |
|
36 |
+ if [[ $EBUILD_PHASE != depend ]] ; then |
37 |
# The user's bashrc is the ONLY non-portage bit of code that can |
38 |
# change shopts without a QA violation. |
39 |
for x in "${PM_EBUILD_HOOK_DIR}"/${CATEGORY}/{${PN},${PN}:${SLOT},${P},${PF}}; do |
40 |
@@ -394,16 +406,6 @@ source_all_bashrcs() { |
41 |
done |
42 |
fi |
43 |
|
44 |
- if [ -r "${PORTAGE_BASHRC}" ] ; then |
45 |
- if [ "$PORTAGE_DEBUG" != "1" ] || [ "${-/x/}" != "$-" ]; then |
46 |
- source "${PORTAGE_BASHRC}" |
47 |
- else |
48 |
- set -x |
49 |
- source "${PORTAGE_BASHRC}" |
50 |
- set +x |
51 |
- fi |
52 |
- fi |
53 |
- |
54 |
[ ! -z "${OCC}" ] && export CC="${OCC}" |
55 |
[ ! -z "${OCXX}" ] && export CXX="${OCXX}" |
56 |
} |