| 1 |
commit: 06259074cf1c75044715bad9229e2aa2a090fc82 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 24 14:15:40 2011 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 24 14:15:40 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=06259074 |
| 7 |
|
| 8 |
Merge commit 'v2.2.0_alpha82' into multilib |
| 9 |
|
| 10 |
|
| 11 |
RELEASE-NOTES | 5 - |
| 12 |
bin/ebuild-helpers/newbin | 5 +- |
| 13 |
bin/ebuild-helpers/newconfd | 5 +- |
| 14 |
bin/ebuild-helpers/newdoc | 5 +- |
| 15 |
bin/ebuild-helpers/newenvd | 5 +- |
| 16 |
bin/ebuild-helpers/newexe | 5 +- |
| 17 |
bin/ebuild-helpers/newinitd | 5 +- |
| 18 |
bin/ebuild-helpers/newins | 3 + |
| 19 |
bin/ebuild-helpers/newlib.a | 5 +- |
| 20 |
bin/ebuild-helpers/newlib.so | 5 +- |
| 21 |
bin/ebuild-helpers/newman | 5 +- |
| 22 |
bin/ebuild-helpers/newsbin | 5 +- |
| 23 |
bin/ebuild-helpers/prepstrip | 37 ++++-- |
| 24 |
bin/ebuild.sh | 20 ++- |
| 25 |
bin/isolated-functions.sh | 6 +- |
| 26 |
bin/misc-functions.sh | 92 ++++++++++--- |
| 27 |
bin/phase-functions.sh | 19 ++- |
| 28 |
cnf/make.conf | 6 + |
| 29 |
cnf/make.conf.ia64.diff | 23 +--- |
| 30 |
cnf/make.conf.s390.diff | 23 +--- |
| 31 |
cnf/make.globals | 4 +- |
| 32 |
doc/package/ebuild.docbook | 1 + |
| 33 |
doc/package/ebuild/eapi/4-python.docbook | 49 +++++++ |
| 34 |
doc/portage.docbook | 1 + |
| 35 |
man/ebuild.5 | 12 ++- |
| 36 |
man/emerge.1 | 20 ++-- |
| 37 |
man/make.conf.5 | 9 +- |
| 38 |
pym/_emerge/AbstractPollTask.py | 67 ++++++++- |
| 39 |
pym/_emerge/AsynchronousLock.py | 4 +- |
| 40 |
pym/_emerge/BinpkgExtractorAsync.py | 3 +- |
| 41 |
pym/_emerge/BlockerCache.py | 2 +- |
| 42 |
pym/_emerge/EbuildExecuter.py | 2 - |
| 43 |
pym/_emerge/FakeVartree.py | 2 - |
| 44 |
pym/_emerge/MergeListItem.py | 2 +- |
| 45 |
pym/_emerge/PackageMerge.py | 2 +- |
| 46 |
pym/_emerge/PipeReader.py | 60 +++++--- |
| 47 |
pym/_emerge/Scheduler.py | 22 +++- |
| 48 |
pym/_emerge/SpawnProcess.py | 50 +++---- |
| 49 |
pym/_emerge/actions.py | 19 +-- |
| 50 |
pym/_emerge/depgraph.py | 73 ++++------ |
| 51 |
pym/_emerge/main.py | 12 +- |
| 52 |
pym/_emerge/resolver/backtracking.py | 2 +- |
| 53 |
pym/_emerge/resolver/output.py | 2 +- |
| 54 |
pym/_emerge/resolver/slot_collision.py | 2 +- |
| 55 |
pym/_emerge/search.py | 2 +- |
| 56 |
pym/portage/data.py | 55 ++++++-- |
| 57 |
pym/portage/dbapi/vartree.py | 128 ++++++++++++++--- |
| 58 |
pym/portage/eclass_cache.py | 2 + |
| 59 |
.../package/ebuild/_config/special_env_vars.py | 2 +- |
| 60 |
pym/portage/package/ebuild/config.py | 5 +- |
| 61 |
pym/portage/package/ebuild/doebuild.py | 4 + |
| 62 |
pym/portage/package/ebuild/fetch.py | 25 ++-- |
| 63 |
pym/portage/repository/config.py | 82 +++++------ |
| 64 |
pym/portage/tests/ebuild/test_pty_eof.py | 45 ------ |
| 65 |
pym/portage/tests/emerge/test_simple.py | 4 +- |
| 66 |
pym/portage/tests/process/test_poll.py | 58 +++++++-- |
| 67 |
pym/portage/util/_pty.py | 153 +------------------- |
| 68 |
57 files changed, 740 insertions(+), 531 deletions(-) |
| 69 |
|
| 70 |
diff --cc bin/phase-functions.sh |
| 71 |
index 1ac66e3,2167853..db41f35 |
| 72 |
--- a/bin/phase-functions.sh |
| 73 |
+++ b/bin/phase-functions.sh |
| 74 |
@@@ -123,15 -127,15 +127,18 @@@ filter_readonly_variables() |
| 75 |
LC_NUMERIC LC_PAPER LC_TIME" |
| 76 |
fi |
| 77 |
if ! has --allow-extra-vars $* ; then |
| 78 |
- filtered_vars=" |
| 79 |
- ${filtered_vars} |
| 80 |
- ${PORTAGE_SAVED_READONLY_VARS} |
| 81 |
- ${PORTAGE_MUTABLE_FILTERED_VARS} |
| 82 |
- " |
| 83 |
+ if [ "${EMERGE_FROM}" = binary ] ; then |
| 84 |
+ # preserve additional variables from build time, |
| 85 |
+ # while excluding untrusted variables |
| 86 |
+ filtered_vars+=" ${binpkg_untrusted_vars}" |
| 87 |
+ else |
| 88 |
+ filtered_vars+=" ${PORTAGE_SAVED_READONLY_VARS}" |
| 89 |
+ filtered_vars+=" ${PORTAGE_MUTABLE_FILTERED_VARS}" |
| 90 |
+ fi |
| 91 |
fi |
| 92 |
+ if has --filter-metadata $* ; then |
| 93 |
+ filtered_vars+=" ${PORTAGE_READONLY_METADATA} filter_opts" |
| 94 |
+ fi |
| 95 |
|
| 96 |
"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed" |
| 97 |
} |
Archives