| 1 |
commit: 58fb9ace0cb1bf49df2ce68b13999d303fa25756 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 28 12:35:46 2016 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 28 12:35:46 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=58fb9ace |
| 7 |
|
| 8 |
merge v2.2.27 |
| 9 |
|
| 10 |
NEWS | 6 +++ |
| 11 |
RELEASE-NOTES | 25 +++++++++ |
| 12 |
bin/ebuild | 20 ++++--- |
| 13 |
bin/ebuild.sh | 25 --------- |
| 14 |
bin/egencache | 20 +------ |
| 15 |
bin/misc-functions.sh | 3 +- |
| 16 |
bin/phase-functions.sh | 36 +++++++++++++ |
| 17 |
bin/portageq | 16 ++++-- |
| 18 |
bin/socks5-server.py | 9 +++- |
| 19 |
cnf/make.globals | 2 +- |
| 20 |
man/ebuild.5 | 4 +- |
| 21 |
man/egencache.1 | 10 +--- |
| 22 |
man/emerge.1 | 6 +++ |
| 23 |
man/emirrordist.1 | 10 +--- |
| 24 |
pym/_emerge/actions.py | 61 ++++++++++++---------- |
| 25 |
pym/_emerge/depgraph.py | 18 +++++-- |
| 26 |
pym/_emerge/main.py | 11 ++++ |
| 27 |
pym/portage/_emirrordist/Config.py | 10 +++- |
| 28 |
pym/portage/_emirrordist/main.py | 23 +------- |
| 29 |
pym/portage/_sets/__init__.py | 4 ++ |
| 30 |
pym/portage/cache/anydbm.py | 3 ++ |
| 31 |
pym/portage/cache/flat_hash.py | 5 ++ |
| 32 |
pym/portage/cache/sqlite.py | 9 +++- |
| 33 |
pym/portage/cache/template.py | 61 +++++++++++++++++----- |
| 34 |
pym/portage/dbapi/porttree.py | 20 +++---- |
| 35 |
pym/portage/dep/dep_check.py | 6 ++- |
| 36 |
pym/portage/elog/mod_save.py | 3 +- |
| 37 |
pym/portage/emaint/modules/merges/__init__.py | 2 +- |
| 38 |
pym/portage/exception.py | 5 +- |
| 39 |
pym/portage/manifest.py | 52 +++++++++++++----- |
| 40 |
.../package/ebuild/_config/LicenseManager.py | 4 +- |
| 41 |
.../package/ebuild/_config/special_env_vars.py | 2 +- |
| 42 |
pym/portage/package/ebuild/config.py | 41 ++++++++++----- |
| 43 |
pym/portage/package/ebuild/doebuild.py | 27 ++++++---- |
| 44 |
pym/portage/package/ebuild/fetch.py | 9 ++-- |
| 45 |
pym/portage/repository/config.py | 21 +++----- |
| 46 |
pym/portage/sync/controller.py | 6 +-- |
| 47 |
pym/portage/tests/dbapi/test_portdb_cache.py | 3 +- |
| 48 |
pym/portage/tests/ebuild/test_config.py | 4 +- |
| 49 |
pym/portage/tests/ebuild/test_doebuild_fd_pipes.py | 37 ++++++------- |
| 50 |
pym/portage/tests/ebuild/test_doebuild_spawn.py | 3 +- |
| 51 |
pym/portage/tests/ebuild/test_ipc_daemon.py | 3 +- |
| 52 |
pym/portage/tests/emerge/test_config_protect.py | 3 +- |
| 53 |
pym/portage/tests/emerge/test_emerge_slot_abi.py | 3 +- |
| 54 |
pym/portage/tests/emerge/test_simple.py | 3 +- |
| 55 |
pym/portage/tests/repoman/test_simple.py | 3 +- |
| 56 |
pym/portage/tests/sync/test_sync_local.py | 3 +- |
| 57 |
pym/portage/xml/metadata.py | 3 ++ |
| 58 |
pym/repoman/_xml.py | 10 ++-- |
| 59 |
pym/repoman/checks/ebuilds/checks.py | 10 ++++ |
| 60 |
pym/repoman/checks/ebuilds/pkgmetadata.py | 6 ++- |
| 61 |
pym/repoman/qa_data.py | 1 + |
| 62 |
pym/repoman/scanner.py | 20 +++++-- |
| 63 |
pym/repoman/vcs/vcsstatus.py | 2 +- |
| 64 |
setup.py | 2 +- |
| 65 |
55 files changed, 445 insertions(+), 269 deletions(-) |
| 66 |
|
| 67 |
diff --cc pym/_emerge/actions.py |
| 68 |
index 9f2ef29,59626ad..e0c8afd |
| 69 |
--- a/pym/_emerge/actions.py |
| 70 |
+++ b/pym/_emerge/actions.py |
| 71 |
@@@ -2809,15 -2814,7 +2814,15 @@@ def run_action(emerge_config) |
| 72 |
adjust_configs(emerge_config.opts, emerge_config.trees) |
| 73 |
apply_priorities(emerge_config.target_config.settings) |
| 74 |
|
| 75 |
+ if 'force-multilib' in emerge_config.target_config.settings.features: |
| 76 |
+ if emerge_config.target_config.settings.get("NO_AUTO_FLAG", "") is "": |
| 77 |
+ writemsg_level(bad("!!! Failed to find vars from extra profile") + "\n",level=logging.ERROR, noiselevel=-1) |
| 78 |
+ writemsg_level(bad("!!! Please make sure that you did follow the instructions and included the extra profile\n"),level=logging.ERROR, noiselevel=-1) |
| 79 |
+ writemsg_level(bad("!!! http://git.overlays.gentoo.org/gitweb/?p=proj/multilib-portage.git;a=blob;f=doc/portage-multilib-instructions\n"),level=logging.ERROR, noiselevel=-1) |
| 80 |
+ writemsg_level(bad("!!! has some basic instructions for the setup\n"),level=logging.ERROR, noiselevel=-1) |
| 81 |
+ return 1 |
| 82 |
+ |
| 83 |
- for fmt in emerge_config.target_config.settings["PORTAGE_BINPKG_FORMAT"].split(): |
| 84 |
+ for fmt in emerge_config.target_config.settings.get("PORTAGE_BINPKG_FORMAT", "").split(): |
| 85 |
if not fmt in portage.const.SUPPORTED_BINPKG_FORMATS: |
| 86 |
if "--pkg-format" in emerge_config.opts: |
| 87 |
problematic="--pkg-format" |
Archives