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 D61AD1382C5 for ; Mon, 22 Feb 2021 13:09:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32824E0845; Mon, 22 Feb 2021 13:09:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 16225E0845 for ; Mon, 22 Feb 2021 13:09:25 +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 1145E340D2A for ; Mon, 22 Feb 2021 13:09:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C07454C2 for ; Mon, 22 Feb 2021 13:09:22 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1613998548.bba152098af82e5bc2686d9facb3c0a88bcbdba0.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: cnf/, man/, lib/portage/tests/emerge/ X-VCS-Repository: proj/portage X-VCS-Files: cnf/make.globals lib/portage/tests/emerge/test_simple.py man/make.conf.5 X-VCS-Directories: cnf/ lib/portage/tests/emerge/ man/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: bba152098af82e5bc2686d9facb3c0a88bcbdba0 X-VCS-Branch: master Date: Mon, 22 Feb 2021 13:09:22 +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: e03a61a8-e915-419d-af25-2dcaeeff6f63 X-Archives-Hash: 63b0c91056107fd87fe45754cef66118 commit: bba152098af82e5bc2686d9facb3c0a88bcbdba0 Author: Zac Medico gentoo org> AuthorDate: Mon Feb 22 12:37:56 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Feb 22 12:55:48 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=bba15209 make.globals: default enable FEATURES=binpkg-multi-instance Bug: https://bugs.gentoo.org/715112 Signed-off-by: Zac Medico gentoo.org> cnf/make.globals | 1 + lib/portage/tests/emerge/test_simple.py | 4 ++-- man/make.conf.5 | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cnf/make.globals b/cnf/make.globals index dd3f28f70..b8bc90ae0 100644 --- a/cnf/make.globals +++ b/cnf/make.globals @@ -54,6 +54,7 @@ FETCHCOMMAND_SFTP="bash -c \"x=\\\${2#sftp://} ; host=\\\${x%%/*} ; port=\\\${ho # Default user options FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs + binpkg-multi-instance config-protect-if-modified distlocks ebuild-locks fixlafiles ipc-sandbox merge-sync multilib-strict network-sandbox news parallel-fetch pid-sandbox diff --git a/lib/portage/tests/emerge/test_simple.py b/lib/portage/tests/emerge/test_simple.py index d26146aa9..6e282337f 100644 --- a/lib/portage/tests/emerge/test_simple.py +++ b/lib/portage/tests/emerge/test_simple.py @@ -322,11 +322,11 @@ call_has_and_best_version() { rm_cmd + ("-rf", cachedir), emerge_cmd + ("--oneshot", "virtual/foo"), lambda: self.assertFalse(os.path.exists( - os.path.join(pkgdir, "virtual", "foo-0.tbz2"))), + os.path.join(pkgdir, "virtual", "foo", "foo-0-1.xpak"))), ({"FEATURES" : "unmerge-backup"},) + \ emerge_cmd + ("--unmerge", "virtual/foo"), lambda: self.assertTrue(os.path.exists( - os.path.join(pkgdir, "virtual", "foo-0.tbz2"))), + os.path.join(pkgdir, "virtual", "foo", "foo-0-1.xpak"))), emerge_cmd + ("--pretend", "dev-libs/A"), ebuild_cmd + (test_ebuild, "manifest", "clean", "package", "merge"), emerge_cmd + ("--pretend", "--tree", "--complete-graph", "dev-libs/A"), diff --git a/man/make.conf.5 b/man/make.conf.5 index 76e0ac155..e78751c16 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -316,6 +316,7 @@ BUILD_TIME metadata to select the latest builds. The \fBeclean\-pkg\fR command can be used to prune old builds from PKGDIR. It is also possible to remove packages manually, and then run \(aqemaint \-\-fix binhost' to update the ${PKGDIR}/Packages index. +This feature is enabled by default. .TP .B buildpkg Binary packages will be created for all packages that are merged. Also see