commit: 0d9cd144937a2a4388cb299fbcd753257b085970 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sun Aug 2 11:17:47 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sun Aug 2 12:32:49 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0d9cd144
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> .travis.yml | 1 - NEWS | 11 + README | 2 +- RELEASE-NOTES | 43 ++ bin/binhost-snapshot | 5 +- bin/check-implicit-pointer-usage.py | 25 +- bin/chmod-lite.py | 11 +- bin/chpathtool.py | 10 +- bin/dispatch-conf | 2 +- bin/dohtml.py | 13 +- bin/doins.py | 31 +- bin/ebuild | 15 +- bin/ebuild-ipc.py | 2 +- bin/ecompress | 36 +- bin/egencache | 17 +- bin/filter-bash-environment.py | 11 +- bin/glsa-check | 2 +- bin/install.py | 19 +- bin/pid-ns-init | 10 +- bin/portageq | 4 +- bin/quickpkg | 2 +- bin/socks5-server.py | 2 +- bin/xattr-helper.py | 32 +- lib/_emerge/AbstractEbuildProcess.py | 3 +- lib/_emerge/AbstractPollTask.py | 1 - lib/_emerge/AsynchronousLock.py | 12 +- lib/_emerge/BinpkgFetcher.py | 14 +- lib/_emerge/BinpkgPrefetcher.py | 1 - lib/_emerge/BlockerCache.py | 29 +- lib/_emerge/BlockerDB.py | 7 +- lib/_emerge/DepPriority.py | 1 - lib/_emerge/DepPriorityNormalRange.py | 2 +- lib/_emerge/DepPrioritySatisfiedRange.py | 2 +- lib/_emerge/Dependency.py | 1 - lib/_emerge/DependencyArg.py | 17 +- lib/_emerge/EbuildBuild.py | 26 +- lib/_emerge/EbuildBuildDir.py | 1 - lib/_emerge/EbuildExecuter.py | 1 - lib/_emerge/EbuildFetcher.py | 15 +- lib/_emerge/EbuildMetadataPhase.py | 12 +- lib/_emerge/EbuildPhase.py | 53 ++- lib/_emerge/FakeVartree.py | 16 +- lib/_emerge/FifoIpcDaemon.py | 31 +- lib/_emerge/JobStatusDisplay.py | 15 +- lib/_emerge/MergeListItem.py | 2 +- lib/_emerge/Package.py | 46 +- lib/_emerge/PackageVirtualDbapi.py | 7 +- lib/_emerge/PipeReader.py | 14 +- lib/_emerge/PollScheduler.py | 2 +- lib/_emerge/ProgressHandler.py | 3 +- lib/_emerge/RootConfig.py | 2 +- lib/_emerge/Scheduler.py | 9 +- lib/_emerge/SequentialTaskQueue.py | 4 - lib/_emerge/SetArg.py | 1 - lib/_emerge/SpawnProcess.py | 85 ++-- lib/_emerge/SubProcess.py | 9 +- lib/_emerge/TaskSequence.py | 6 +- lib/_emerge/UnmergeDepPriority.py | 1 - lib/_emerge/UseFlagDisplay.py | 15 +- lib/_emerge/UserQuery.py | 23 +- lib/_emerge/_find_deep_system_runtime_deps.py | 1 - lib/_emerge/actions.py | 44 +- lib/_emerge/create_depgraph_params.py | 1 - lib/_emerge/create_world_atom.py | 10 +- lib/_emerge/depgraph.py | 167 ++++---- lib/_emerge/emergelog.py | 3 - lib/_emerge/help.py | 2 +- lib/_emerge/main.py | 14 +- lib/_emerge/resolver/DbapiProvidesIndex.py | 8 +- lib/_emerge/resolver/backtracking.py | 9 +- lib/_emerge/resolver/circular_dependency.py | 4 +- lib/_emerge/resolver/output.py | 65 ++- lib/_emerge/resolver/output_helpers.py | 35 +- lib/_emerge/resolver/package_tracker.py | 4 +- lib/_emerge/resolver/slot_collision.py | 85 ++-- lib/_emerge/search.py | 9 +- lib/_emerge/show_invalid_depstring_notice.py | 1 - lib/_emerge/stdout_spinner.py | 2 +- lib/_emerge/unmerge.py | 5 +- lib/portage/__init__.py | 67 ++- lib/portage/_emirrordist/Config.py | 11 +- lib/portage/_emirrordist/DeletionIterator.py | 2 +- lib/portage/_emirrordist/FetchIterator.py | 2 +- lib/portage/_emirrordist/FetchTask.py | 51 +-- lib/portage/_emirrordist/MirrorDistTask.py | 8 +- lib/portage/_emirrordist/main.py | 9 +- lib/portage/_global_updates.py | 3 +- lib/portage/_legacy_globals.py | 2 +- lib/portage/_selinux.py | 15 +- lib/portage/_sets/__init__.py | 9 +- lib/portage/_sets/base.py | 16 +- lib/portage/_sets/dbapi.py | 51 ++- lib/portage/cache/__init__.py | 1 - lib/portage/cache/anydbm.py | 36 +- lib/portage/cache/ebuild_xattr.py | 35 +- lib/portage/cache/flat_hash.py | 8 +- lib/portage/cache/fs_template.py | 13 +- lib/portage/cache/index/IndexStreamIterator.py | 2 +- lib/portage/cache/index/pkg_desc_index.py | 13 +- lib/portage/cache/mappings.py | 54 +-- lib/portage/cache/metadata.py | 9 +- lib/portage/cache/sql_template.py | 6 +- lib/portage/cache/sqlite.py | 15 +- lib/portage/cache/template.py | 34 +- lib/portage/checksum.py | 11 +- lib/portage/const.py | 2 - lib/portage/cvstree.py | 19 +- lib/portage/data.py | 10 +- lib/portage/dbapi/DummyTree.py | 2 +- lib/portage/dbapi/IndexedPortdb.py | 7 +- lib/portage/dbapi/IndexedVardb.py | 5 +- .../dbapi/_ContentsCaseSensitivityManager.py | 2 +- lib/portage/dbapi/_MergeProcess.py | 128 ++---- lib/portage/dbapi/_VdbMetadataDelta.py | 2 +- lib/portage/dbapi/__init__.py | 4 +- lib/portage/dbapi/_expand_new_virt.py | 2 - lib/portage/dbapi/bintree.py | 81 ++-- lib/portage/dbapi/cpv_expand.py | 8 +- lib/portage/dbapi/dep_expand.py | 2 - lib/portage/dbapi/porttree.py | 42 +- lib/portage/dbapi/vartree.py | 88 ++-- lib/portage/dbapi/virtual.py | 7 +- lib/portage/debug.py | 16 +- lib/portage/dep/__init__.py | 211 +++++----- lib/portage/dep/_dnf.py | 4 +- lib/portage/dep/_slot_operator.py | 2 - lib/portage/dep/dep_check.py | 15 +- lib/portage/dep/soname/SonameAtom.py | 13 +- lib/portage/dep/soname/multilib_category.py | 2 - lib/portage/dep/soname/parse.py | 2 - lib/portage/dispatch_conf.py | 4 +- lib/portage/eclass_cache.py | 17 +- lib/portage/elog/__init__.py | 6 +- lib/portage/elog/messages.py | 5 +- lib/portage/elog/mod_echo.py | 5 +- lib/portage/elog/mod_mail_summary.py | 4 +- lib/portage/elog/mod_save_summary.py | 5 - lib/portage/elog/mod_syslog.py | 10 +- lib/portage/emaint/main.py | 4 +- lib/portage/emaint/modules/binhost/binhost.py | 12 +- lib/portage/emaint/modules/config/config.py | 2 +- lib/portage/emaint/modules/logs/logs.py | 2 +- lib/portage/emaint/modules/merges/merges.py | 8 +- lib/portage/emaint/modules/move/move.py | 2 +- lib/portage/emaint/modules/resume/resume.py | 2 +- lib/portage/emaint/modules/sync/sync.py | 13 +- lib/portage/emaint/modules/world/world.py | 3 +- lib/portage/env/__init__.py | 1 - lib/portage/env/loaders.py | 2 +- lib/portage/exception.py | 53 +-- lib/portage/getbinpkg.py | 55 +-- lib/portage/glsa.py | 16 +- lib/portage/locks.py | 46 +- lib/portage/mail.py | 57 +-- lib/portage/manifest.py | 37 +- lib/portage/metadata.py | 2 +- lib/portage/module.py | 4 +- lib/portage/news.py | 8 +- lib/portage/output.py | 49 +-- .../package/ebuild/_config/KeywordsManager.py | 2 +- .../package/ebuild/_config/LicenseManager.py | 2 +- .../package/ebuild/_config/LocationsManager.py | 4 +- lib/portage/package/ebuild/_config/MaskManager.py | 2 +- lib/portage/package/ebuild/_config/UseManager.py | 2 +- .../package/ebuild/_config/VirtualsManager.py | 2 +- lib/portage/package/ebuild/_config/features_set.py | 2 +- .../package/ebuild/_config/special_env_vars.py | 10 +- lib/portage/package/ebuild/_ipc/IpcCommand.py | 2 +- lib/portage/package/ebuild/_ipc/QueryCommand.py | 17 +- .../ebuild/_parallel_manifest/ManifestProcess.py | 3 +- .../ebuild/_parallel_manifest/ManifestScheduler.py | 2 - lib/portage/package/ebuild/config.py | 51 +-- lib/portage/package/ebuild/doebuild.py | 20 +- lib/portage/package/ebuild/fetch.py | 28 +- lib/portage/package/ebuild/getmaskingreason.py | 9 +- lib/portage/package/ebuild/getmaskingstatus.py | 16 +- lib/portage/package/ebuild/prepare_build_dirs.py | 2 - lib/portage/process.py | 29 +- lib/portage/progress.py | 3 +- lib/portage/proxy/lazyimport.py | 7 +- lib/portage/proxy/objectproxy.py | 11 +- lib/portage/repository/config.py | 43 +- lib/portage/repository/storage/hardlink_rcu.py | 13 +- lib/portage/repository/storage/interface.py | 2 +- lib/portage/sync/config_checks.py | 2 +- lib/portage/sync/controller.py | 12 +- lib/portage/sync/getaddrinfo_validate.py | 7 +- lib/portage/sync/modules/git/__init__.py | 13 +- lib/portage/sync/modules/git/git.py | 37 +- lib/portage/sync/modules/rsync/rsync.py | 14 +- lib/portage/sync/modules/webrsync/webrsync.py | 1 - lib/portage/sync/syncbase.py | 12 +- lib/portage/tests/bin/setup_env.py | 20 +- lib/portage/tests/dbapi/test_auxdb.py | 2 - lib/portage/tests/dep/testAtom.py | 2 +- lib/portage/tests/dep/test_isvalidatom.py | 2 +- lib/portage/tests/dep/test_match_from_list.py | 14 +- lib/portage/tests/dep/test_soname_atom_pickle.py | 3 - lib/portage/tests/dep/test_use_reduce.py | 2 +- lib/portage/tests/ebuild/test_config.py | 2 - lib/portage/tests/ebuild/test_fetch.py | 6 +- lib/portage/tests/ebuild/test_spawn.py | 1 - .../tests/ebuild/test_use_expand_incremental.py | 2 - lib/portage/tests/emerge/test_config_protect.py | 2 - lib/portage/tests/env/__init__.py | 1 - lib/portage/tests/env/config/__init__.py | 1 - lib/portage/tests/glsa/test_security_set.py | 2 - lib/portage/tests/lint/test_bash_syntax.py | 1 - lib/portage/tests/process/test_AsyncFunction.py | 38 ++ lib/portage/tests/process/test_PipeLogger.py | 58 +++ lib/portage/tests/process/test_poll.py | 10 +- lib/portage/tests/resolver/ResolverPlayground.py | 19 +- .../resolver/test_binary_pkg_ebuild_visibility.py | 1 - .../tests/resolver/test_profile_default_eapi.py | 2 - .../tests/resolver/test_profile_package_set.py | 2 - lib/portage/tests/sets/files/testConfigFileSet.py | 1 - lib/portage/tests/sets/files/testStaticFileSet.py | 1 - lib/portage/tests/sets/shell/testShell.py | 8 +- lib/portage/tests/sync/test_sync_local.py | 11 +- lib/portage/tests/unicode/test_string_format.py | 54 +-- lib/portage/tests/util/__init__.py | 1 - .../tests/util/futures/asyncio/test_pipe_closed.py | 10 +- .../asyncio/test_policy_wrapper_recursion.py | 8 +- .../util/futures/asyncio/test_subprocess_exec.py | 5 - .../tests/util/futures/test_compat_coroutine.py | 2 +- lib/portage/tests/util/futures/test_retry.py | 34 +- lib/portage/tests/util/test_socks5.py | 31 +- lib/portage/tests/util/test_xattr.py | 14 +- lib/portage/update.py | 18 +- lib/portage/util/SlotObject.py | 2 +- lib/portage/util/_ShelveUnicodeWrapper.py | 45 -- lib/portage/util/__init__.py | 109 ++--- lib/portage/util/_async/AsyncFunction.py | 4 +- lib/portage/util/_async/BuildLogger.py | 109 +++++ lib/portage/util/_async/ForkProcess.py | 146 +++++-- lib/portage/util/_async/PipeLogger.py | 160 ++++--- lib/portage/util/_async/SchedulerInterface.py | 32 +- lib/portage/util/_compare_files.py | 23 +- lib/portage/util/_desktop_entry.py | 8 +- lib/portage/util/_dyn_libs/LinkageMapELF.py | 48 +-- lib/portage/util/_dyn_libs/NeededEntry.py | 15 +- .../util/_dyn_libs/PreservedLibsRegistry.py | 21 +- lib/portage/util/_dyn_libs/soname_deps.py | 4 +- lib/portage/util/_eventloop/EventLoop.py | 50 +-- lib/portage/util/_eventloop/PollConstants.py | 3 +- lib/portage/util/_eventloop/PollSelectAdapter.py | 3 +- lib/portage/util/_eventloop/asyncio_event_loop.py | 9 +- lib/portage/util/_eventloop/global_event_loop.py | 16 +- lib/portage/util/_urlopen.py | 67 ++- lib/portage/util/_xattr.py | 2 +- lib/portage/util/backoff.py | 2 +- lib/portage/util/changelog.py | 29 +- lib/portage/util/compression_probe.py | 5 +- lib/portage/util/configparser.py | 23 +- lib/portage/util/digraph.py | 8 +- lib/portage/util/elf/header.py | 2 +- lib/portage/util/env_update.py | 8 +- lib/portage/util/formatter.py | 5 +- lib/portage/util/futures/_asyncio/__init__.py | 48 +-- lib/portage/util/futures/_asyncio/process.py | 15 +- lib/portage/util/futures/_asyncio/streams.py | 52 ++- lib/portage/util/futures/_asyncio/tasks.py | 9 +- lib/portage/util/futures/compat_coroutine.py | 3 +- lib/portage/util/futures/events.py | 37 +- lib/portage/util/futures/executor/fork.py | 2 +- lib/portage/util/futures/extendedfutures.py | 2 - lib/portage/util/futures/futures.py | 42 +- lib/portage/util/futures/retry.py | 2 +- lib/portage/util/futures/transports.py | 5 +- lib/portage/util/futures/unix_events.py | 34 +- lib/portage/util/install_mask.py | 13 +- lib/portage/util/iterators/MultiIterGroupBy.py | 4 +- lib/portage/util/lafilefixer.py | 11 +- lib/portage/util/listdir.py | 3 - lib/portage/util/locale.py | 2 +- lib/portage/util/monotonic.py | 34 -- lib/portage/util/movefile.py | 65 +-- lib/portage/util/mtimedb.py | 6 +- lib/portage/util/socks5.py | 2 +- lib/portage/util/whirlpool.py | 26 +- lib/portage/util/writeable_check.py | 2 - lib/portage/versions.py | 40 +- lib/portage/xml/metadata.py | 24 +- lib/portage/xpak.py | 5 +- man/ebuild.5 | 4 +- man/egencache.1 | 4 +- man/emerge.1 | 8 +- man/make.conf.5 | 7 +- man/portage.5 | 54 +-- pylintrc | 464 +++++++++++++++++++++ repoman/RELEASE-NOTES | 5 + repoman/lib/repoman/__init__.py | 7 +- repoman/lib/repoman/actions.py | 4 +- repoman/lib/repoman/copyrights.py | 2 +- repoman/lib/repoman/errors.py | 2 +- repoman/lib/repoman/gpg.py | 2 +- repoman/lib/repoman/main.py | 4 +- repoman/lib/repoman/metadata.py | 7 +- repoman/lib/repoman/modules/commit/manifest.py | 2 +- repoman/lib/repoman/modules/commit/repochecks.py | 2 +- repoman/lib/repoman/modules/linechecks/base.py | 2 +- repoman/lib/repoman/modules/linechecks/config.py | 4 +- .../lib/repoman/modules/linechecks/controller.py | 2 +- .../modules/linechecks/deprecated/inherit.py | 2 + repoman/lib/repoman/modules/scan/ebuild/ebuild.py | 2 +- .../modules/scan/metadata/ebuild_metadata.py | 5 +- .../lib/repoman/modules/scan/metadata/use_flags.py | 2 +- repoman/lib/repoman/modules/scan/module.py | 2 +- repoman/lib/repoman/modules/scan/scanbase.py | 2 +- repoman/lib/repoman/modules/vcs/None/status.py | 2 +- repoman/lib/repoman/modules/vcs/bzr/status.py | 2 +- repoman/lib/repoman/modules/vcs/changes.py | 2 +- repoman/lib/repoman/modules/vcs/cvs/status.py | 2 +- repoman/lib/repoman/modules/vcs/git/status.py | 2 +- repoman/lib/repoman/modules/vcs/hg/status.py | 2 +- repoman/lib/repoman/modules/vcs/settings.py | 4 +- repoman/lib/repoman/modules/vcs/svn/status.py | 2 +- repoman/lib/repoman/modules/vcs/vcs.py | 2 +- repoman/lib/repoman/profile.py | 4 +- repoman/lib/repoman/qa_data.py | 2 +- repoman/lib/repoman/qa_tracker.py | 2 +- repoman/lib/repoman/repos.py | 2 +- repoman/lib/repoman/scanner.py | 4 +- repoman/lib/repoman/utilities.py | 5 +- repoman/setup.py | 4 +- runtests | 3 +- setup.py | 4 +- tox.ini | 6 +- 328 files changed, 2638 insertions(+), 3095 deletions(-) diff --cc lib/portage/const.py index 146808fea,9a7ea23bd..50412c058 --- a/lib/portage/const.py +++ b/lib/portage/const.py @@@ -2,13 -2,6 +2,11 @@@ # Copyright 1998-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 - from __future__ import unicode_literals - +# =========================================================================== +# autotool supplied constants. +# =========================================================================== +from portage.const_autotool import * + import os # =========================================================================== diff --cc lib/portage/data.py index 20a8d1ba7,3887ad32e..d2d356f95 --- a/lib/portage/data.py +++ b/lib/portage/data.py @@@ -2,8 -2,10 +2,11 @@@ # Copyright 1998-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 - import os, pwd, grp, platform, sys + import grp + import os + import platform + import pwd +from portage.const import PORTAGE_GROUPNAME, PORTAGE_USERNAME, EPREFIX import portage portage.proxy.lazyimport.lazyimport(globals(), diff --cc lib/portage/util/__init__.py index 6bff97fb7,84f1391f6..322b217be --- a/lib/portage/util/__init__.py +++ b/lib/portage/util/__init__.py @@@ -48,12 -43,7 +43,8 @@@ from portage.exception import InvalidAt from portage.localization import _ from portage.proxy.objectproxy import ObjectProxy from portage.cache.mappings import UserDict +from portage.const import EPREFIX - if sys.hexversion >= 0x3000000: - _unicode = str - else: - _unicode = unicode noiselimit = 0
