From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D971E1382C5 for ; Sun, 24 Jan 2021 09:02:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1A2B1E08A0; Sun, 24 Jan 2021 09:02:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E6AD2E08A0 for ; Sun, 24 Jan 2021 09:02:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94B4D3410A2 for ; Sun, 24 Jan 2021 09:02:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D01F12C5 for ; Sun, 24 Jan 2021 09:02:04 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1611478895.8f0e38ebd69ed128d6ad7ff59c4d255bfc070d94.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: / X-VCS-Repository: proj/portage X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 8f0e38ebd69ed128d6ad7ff59c4d255bfc070d94 X-VCS-Branch: prefix Date: Sun, 24 Jan 2021 09:02:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7c24e847-8e77-48f7-8493-7cd1ad0083d4 X-Archives-Hash: 436bb9755594dce8e9150708ed65dff3 commit: 8f0e38ebd69ed128d6ad7ff59c4d255bfc070d94 Author: Fabian Groffen gentoo org> AuthorDate: Sun Jan 24 09:01:35 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Jan 24 09:01:35 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=8f0e38eb Merge remote-tracking branch 'origin/master' into prefix Signed-off-by: Fabian Groffen gentoo.org> NEWS | 6 ++ RELEASE-NOTES | 20 +++++ bin/clean_locks | 5 +- bin/dispatch-conf | 17 ++-- bin/ebuild | 4 +- bin/egencache | 6 +- bin/emerge | 13 +-- bin/glsa-check | 5 +- bin/portageq | 18 ++-- bin/quickpkg | 10 +-- bin/regenworld | 6 +- cnf/sets/portage.conf | 5 ++ doc/config/sets.docbook | 8 ++ lib/_emerge/depgraph.py | 22 +++++ lib/portage/__init__.py | 3 +- lib/portage/_emirrordist/FetchTask.py | 3 +- lib/portage/_sets/dbapi.py | 39 ++++++++- lib/portage/dbapi/bintree.py | 58 ++++++++----- lib/portage/dbapi/vartree.py | 8 +- lib/portage/emaint/modules/move/move.py | 13 ++- lib/portage/package/ebuild/doebuild.py | 13 +-- lib/portage/package/ebuild/fetch.py | 11 ++- .../repository/storage/hardlink_quarantine.py | 45 ++++------ lib/portage/repository/storage/hardlink_rcu.py | 57 +++++-------- lib/portage/repository/storage/inplace.py | 27 ++---- lib/portage/repository/storage/interface.py | 17 ++-- lib/portage/tests/dbapi/test_auxdb.py | 12 ++- lib/portage/tests/emerge/test_simple.py | 16 ++-- lib/portage/tests/process/test_AsyncFunction.py | 10 +-- lib/portage/tests/process/test_PipeLogger.py | 22 +++-- .../resolver/test_slot_operator_reverse_deps.py | 98 +++++++++++++++++++++- lib/portage/tests/update/test_move_ent.py | 7 +- .../util/futures/asyncio/test_child_watcher.py | 10 +-- .../util/futures/asyncio/test_subprocess_exec.py | 32 ++++--- lib/portage/tests/util/futures/test_retry.py | 28 ++----- lib/portage/tests/util/test_socks5.py | 4 +- lib/portage/util/_eventloop/asyncio_event_loop.py | 30 ++++++- lib/portage/util/_eventloop/global_event_loop.py | 28 +------ lib/portage/util/futures/_asyncio/__init__.py | 30 +++++-- lib/portage/util/futures/_sync_decorator.py | 6 +- lib/portage/util/futures/compat_coroutine.py | 6 +- lib/portage/util/socks5.py | 9 +- man/make.conf.5 | 16 +++- repoman/lib/repoman/_subprocess.py | 4 - repoman/lib/repoman/actions.py | 3 +- repoman/lib/repoman/config.py | 5 -- repoman/lib/repoman/gpg.py | 2 - repoman/lib/repoman/main.py | 3 +- repoman/lib/repoman/metadata.py | 1 - repoman/lib/repoman/modules/commit/manifest.py | 1 - repoman/lib/repoman/modules/commit/repochecks.py | 1 - repoman/lib/repoman/modules/linechecks/__init__.py | 1 - .../modules/linechecks/assignment/__init__.py | 3 +- .../repoman/modules/linechecks/depend/__init__.py | 3 +- .../modules/linechecks/deprecated/__init__.py | 3 +- .../modules/linechecks/deprecated/deprecated.py | 2 +- .../lib/repoman/modules/linechecks/do/__init__.py | 3 +- .../repoman/modules/linechecks/eapi/__init__.py | 3 +- .../repoman/modules/linechecks/emake/__init__.py | 3 +- .../modules/linechecks/gentoo_header/__init__.py | 3 +- .../repoman/modules/linechecks/helpers/__init__.py | 3 +- .../repoman/modules/linechecks/helpers/offset.py | 2 +- .../repoman/modules/linechecks/nested/__init__.py | 3 +- .../repoman/modules/linechecks/patches/__init__.py | 3 +- .../repoman/modules/linechecks/patches/patches.py | 3 +- .../repoman/modules/linechecks/phases/__init__.py | 3 +- .../repoman/modules/linechecks/portage/__init__.py | 3 +- .../repoman/modules/linechecks/quotes/__init__.py | 3 +- .../lib/repoman/modules/linechecks/uri/__init__.py | 3 +- repoman/lib/repoman/modules/linechecks/uri/uri.py | 28 +++---- .../lib/repoman/modules/linechecks/use/__init__.py | 3 +- .../repoman/modules/linechecks/use/builtwith.py | 2 +- .../repoman/modules/linechecks/useless/__init__.py | 3 +- .../modules/linechecks/whitespace/__init__.py | 3 +- .../modules/linechecks/workaround/__init__.py | 3 +- .../modules/linechecks/workaround/workarounds.py | 2 +- .../lib/repoman/modules/scan/depend/__init__.py | 3 +- .../repoman/modules/scan/depend/_depend_checks.py | 4 +- repoman/lib/repoman/modules/scan/depend/profile.py | 22 ++--- .../repoman/modules/scan/directories/__init__.py | 3 +- repoman/lib/repoman/modules/scan/eapi/__init__.py | 3 +- .../lib/repoman/modules/scan/ebuild/__init__.py | 3 +- .../lib/repoman/modules/scan/eclasses/__init__.py | 3 +- repoman/lib/repoman/modules/scan/fetch/__init__.py | 3 +- .../lib/repoman/modules/scan/keywords/__init__.py | 3 +- .../lib/repoman/modules/scan/manifest/__init__.py | 3 +- .../lib/repoman/modules/scan/metadata/__init__.py | 3 +- .../modules/scan/metadata/ebuild_metadata.py | 1 - .../repoman/modules/scan/metadata/pkgmetadata.py | 5 +- .../lib/repoman/modules/scan/metadata/restrict.py | 1 - .../lib/repoman/modules/scan/options/__init__.py | 3 +- repoman/lib/repoman/modules/vcs/None/status.py | 1 - repoman/lib/repoman/modules/vcs/__init__.py | 1 - repoman/lib/repoman/modules/vcs/bzr/changes.py | 2 +- repoman/lib/repoman/modules/vcs/bzr/status.py | 2 + repoman/lib/repoman/modules/vcs/cvs/status.py | 2 +- repoman/lib/repoman/modules/vcs/git/changes.py | 3 +- repoman/lib/repoman/modules/vcs/git/status.py | 3 +- repoman/lib/repoman/modules/vcs/hg/changes.py | 3 +- repoman/lib/repoman/modules/vcs/hg/status.py | 2 + repoman/lib/repoman/modules/vcs/svn/changes.py | 2 - repoman/lib/repoman/modules/vcs/svn/status.py | 1 + repoman/lib/repoman/modules/vcs/vcs.py | 2 - repoman/lib/repoman/repos.py | 1 + repoman/lib/repoman/tests/commit/__test__.py | 1 - repoman/lib/repoman/tests/runTests.py | 8 +- repoman/lib/repoman/tests/simple/__test__.py | 1 - repoman/lib/repoman/tests/simple/test_simple.py | 4 +- repoman/lib/repoman/utilities.py | 6 +- setup.py | 2 +- tox.ini | 2 +- 111 files changed, 585 insertions(+), 444 deletions(-) diff --cc bin/clean_locks index 25dc62915,e5765fd7e..7959486ac --- a/bin/clean_locks +++ b/bin/clean_locks @@@ -1,8 -1,9 +1,9 @@@ -#!/usr/bin/python -b +#!@PREFIX_PORTAGE_PYTHON@ -b - # Copyright 1999-2020 Gentoo Authors + # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 - import sys, errno + import errno + import sys from os import path as osp if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")): sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "lib")) diff --cc bin/dispatch-conf index 6fe6d332c,0fdfbaa81..d2b034666 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python -b +#!@PREFIX_PORTAGE_PYTHON@ -b - # Copyright 1999-2020 Gentoo Authors + # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # diff --cc bin/ebuild index 54c024fd3,0a2b13a13..6f70ee4bf --- a/bin/ebuild +++ b/bin/ebuild @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python -b +#!@PREFIX_PORTAGE_PYTHON@ -b - # Copyright 1999-2020 Gentoo Authors + # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import argparse diff --cc bin/egencache index ae54b611c,9b6df2e7d..e083b78d7 --- a/bin/egencache +++ b/bin/egencache @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python -b +#!@PREFIX_PORTAGE_PYTHON@ -b - # Copyright 2009-2020 Gentoo Authors + # Copyright 2009-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # unicode_literals for compat with TextIOWrapper in Python 2 diff --cc bin/emerge index 8f1db61a6,813d7bae5..d952840ef --- a/bin/emerge +++ b/bin/emerge @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python -b +#!@PREFIX_PORTAGE_PYTHON@ -b - # Copyright 2006-2020 Gentoo Authors + # Copyright 2006-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import platform diff --cc bin/glsa-check index a61dee4f8,a3e7aa043..2aada5bee --- a/bin/glsa-check +++ b/bin/glsa-check @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python -b +#!@PREFIX_PORTAGE_PYTHON@ -b - # Copyright 1999-2020 Gentoo Authors + # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import argparse diff --cc bin/portageq index 91b9c1322,67fdc9d38..cb991fef7 --- a/bin/portageq +++ b/bin/portageq @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python -b +#!@PREFIX_PORTAGE_PYTHON@ -b - # Copyright 1999-2020 Gentoo Authors + # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import argparse diff --cc bin/quickpkg index 72fe19c18,1b7ad666c..1bcbda8ba --- a/bin/quickpkg +++ b/bin/quickpkg @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python -b +#!@PREFIX_PORTAGE_PYTHON@ -b - # Copyright 1999-2020 Gentoo Authors + # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import argparse diff --cc bin/regenworld index c195c0b3a,a5b1f0431..e3f852f26 --- a/bin/regenworld +++ b/bin/regenworld @@@ -1,5 -1,5 +1,5 @@@ -#!/usr/bin/python -b +#!@PREFIX_PORTAGE_PYTHON@ -b - # Copyright 1999-2020 Gentoo Authors + # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import sys