| 1 |
commit: 16fcf4998f4b55f1697e4358c7b232e3cab56a11 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 7 10:38:27 2018 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 7 10:38:27 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=16fcf499 |
| 7 |
|
| 8 |
Merge tag 'portage-2.3.7' into multilib |
| 9 |
|
| 10 |
.editorconfig | 14 +++ |
| 11 |
.travis.yml | 4 +- |
| 12 |
NEWS | 15 +++ |
| 13 |
RELEASE-NOTES | 16 ++- |
| 14 |
bin/ebuild-helpers/doman | 1 + |
| 15 |
bin/install-qa-check.d/80multilib-strict | 7 +- |
| 16 |
bin/misc-functions.sh | 6 +- |
| 17 |
bin/phase-helpers.sh | 45 +++++--- |
| 18 |
bin/quickpkg | 62 ++++++++--- |
| 19 |
cnf/make.globals | 3 +- |
| 20 |
man/emerge.1 | 7 ++ |
| 21 |
man/make.conf.5 | 25 +++++ |
| 22 |
man/portage.5 | 27 ++++- |
| 23 |
pym/_emerge/BinpkgExtractorAsync.py | 43 +++++++- |
| 24 |
pym/_emerge/actions.py | 15 +++ |
| 25 |
pym/_emerge/depgraph.py | 117 +++++++++++++++++---- |
| 26 |
pym/_emerge/main.py | 9 ++ |
| 27 |
pym/_emerge/search.py | 24 ++++- |
| 28 |
pym/portage/const.py | 3 +- |
| 29 |
pym/portage/dbapi/bintree.py | 18 ++-- |
| 30 |
pym/portage/dep/dep_check.py | 6 +- |
| 31 |
pym/portage/localization.py | 2 +- |
| 32 |
.../package/ebuild/_config/KeywordsManager.py | 4 +- |
| 33 |
pym/portage/package/ebuild/_config/UseManager.py | 5 +- |
| 34 |
.../package/ebuild/_config/special_env_vars.py | 3 +- |
| 35 |
pym/portage/package/ebuild/config.py | 27 +++++ |
| 36 |
pym/portage/package/ebuild/doebuild.py | 34 +++++- |
| 37 |
pym/portage/sync/modules/git/__init__.py | 8 +- |
| 38 |
pym/portage/sync/modules/git/git.py | 37 ++++++- |
| 39 |
pym/portage/sync/modules/rsync/__init__.py | 3 +- |
| 40 |
pym/portage/sync/modules/rsync/rsync.py | 12 +++ |
| 41 |
pym/portage/sync/syncbase.py | 5 +- |
| 42 |
pym/portage/tests/emerge/test_simple.py | 5 +- |
| 43 |
.../tests/resolver/test_autounmask_binpkg_use.py | 64 +++++++++++ |
| 44 |
.../resolver/test_autounmask_keep_keywords.py | 72 +++++++++++++ |
| 45 |
pym/portage/util/_urlopen.py | 12 +++ |
| 46 |
pym/portage/util/compression_probe.py | 45 ++++++-- |
| 47 |
repoman/RELEASE-NOTES | 12 +++ |
| 48 |
repoman/bin/repoman | 4 +- |
| 49 |
repoman/man/repoman.1 | 20 +++- |
| 50 |
repoman/pym/repoman/actions.py | 55 ++++++++-- |
| 51 |
repoman/pym/repoman/argparser.py | 16 ++- |
| 52 |
repoman/pym/repoman/main.py | 4 +- |
| 53 |
repoman/pym/repoman/modules/scan/ebuild/checks.py | 5 + |
| 54 |
.../pym/repoman/modules/scan/keywords/keywords.py | 26 ++++- |
| 55 |
.../repoman/modules/scan/metadata/pkgmetadata.py | 10 ++ |
| 56 |
repoman/pym/repoman/qa_data.py | 1 + |
| 57 |
repoman/pym/repoman/scanner.py | 2 +- |
| 58 |
repoman/pym/repoman/tests/runTests.py | 4 +- |
| 59 |
repoman/runtests | 4 +- |
| 60 |
repoman/setup.py | 2 +- |
| 61 |
setup.py | 8 +- |
| 62 |
52 files changed, 844 insertions(+), 134 deletions(-) |
| 63 |
|
| 64 |
diff --cc pym/_emerge/actions.py |
| 65 |
index 6f6646b34,3c6c265f7..d9647dd9a |
| 66 |
--- a/pym/_emerge/actions.py |
| 67 |
+++ b/pym/_emerge/actions.py |
| 68 |
@@@ -2862,13 -2872,11 +2872,18 @@@ def run_action(emerge_config) |
| 69 |
adjust_configs(emerge_config.opts, emerge_config.trees) |
| 70 |
apply_priorities(emerge_config.target_config.settings) |
| 71 |
|
| 72 |
+ if 'force-multilib' in emerge_config.target_config.settings.features: |
| 73 |
+ if emerge_config.target_config.settings.get("NO_AUTO_FLAG", "") is "": |
| 74 |
+ writemsg_level(bad("!!! Failed to find vars from extra profile") + "\n",level=logging.ERROR, noiselevel=-1) |
| 75 |
+ writemsg_level(bad("!!! Please make sure that you did follow the instructions and included the extra profile\n"),level=logging.ERROR, noiselevel=-1) |
| 76 |
+ 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) |
| 77 |
+ writemsg_level(bad("!!! has some basic instructions for the setup\n"),level=logging.ERROR, noiselevel=-1) |
| 78 |
+ return 1 |
| 79 |
+ if ("--autounmask-continue" in emerge_config.opts and |
| 80 |
+ emerge_config.opts.get("--autounmask") == "n"): |
| 81 |
+ writemsg_level( |
| 82 |
+ " %s --autounmask-continue has been disabled by --autounmask=n\n" % |
| 83 |
+ warn("*"), level=logging.WARNING, noiselevel=-1) |
| 84 |
|
| 85 |
for fmt in emerge_config.target_config.settings.get("PORTAGE_BINPKG_FORMAT", "").split(): |
| 86 |
if not fmt in portage.const.SUPPORTED_BINPKG_FORMATS: |
Archives