1 |
commit: 8d524638e4e664a684d781181a09eee3de12319c |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 22 19:39:32 2011 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 22 19:39:32 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8d524638 |
7 |
|
8 |
filter_readonly_variables: refactor binpkg logic |
9 |
|
10 |
--- |
11 |
bin/phase-functions.sh | 17 +++++++++-------- |
12 |
1 files changed, 9 insertions(+), 8 deletions(-) |
13 |
|
14 |
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh |
15 |
index 7407aba..2167853 100644 |
16 |
--- a/bin/phase-functions.sh |
17 |
+++ b/bin/phase-functions.sh |
18 |
@@ -126,14 +126,15 @@ filter_readonly_variables() { |
19 |
LC_CTYPE LC_MESSAGES LC_MONETARY |
20 |
LC_NUMERIC LC_PAPER LC_TIME" |
21 |
fi |
22 |
- if [[ ${EMERGE_FROM} != binary ]] && ! has --allow-extra-vars $* ; then |
23 |
- filtered_vars=" |
24 |
- ${filtered_vars} |
25 |
- ${PORTAGE_SAVED_READONLY_VARS} |
26 |
- ${PORTAGE_MUTABLE_FILTERED_VARS} |
27 |
- " |
28 |
- elif ! has --allow-extra-vars $* ; then |
29 |
- filtered_vars+=" ${binpkg_untrusted_vars}" |
30 |
+ if ! has --allow-extra-vars $* ; then |
31 |
+ if [ "${EMERGE_FROM}" = binary ] ; then |
32 |
+ # preserve additional variables from build time, |
33 |
+ # while excluding untrusted variables |
34 |
+ filtered_vars+=" ${binpkg_untrusted_vars}" |
35 |
+ else |
36 |
+ filtered_vars+=" ${PORTAGE_SAVED_READONLY_VARS}" |
37 |
+ filtered_vars+=" ${PORTAGE_MUTABLE_FILTERED_VARS}" |
38 |
+ fi |
39 |
fi |
40 |
|
41 |
"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed" |