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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 27F8B158042 for ; Sun, 3 Nov 2024 21:26:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65BC8E081E; Sun, 3 Nov 2024 21:26:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A65DE081E for ; Sun, 3 Nov 2024 21:26:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 63A6E34131D for ; Sun, 3 Nov 2024 21:26:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0327DF42 for ; Sun, 3 Nov 2024 21:26:35 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1730669162.1e2df4c0df919f62ba68ed1a9d43bcd855e074ee.floppym@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/, lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/Scheduler.py lib/portage/package/ebuild/doebuild.py X-VCS-Directories: lib/_emerge/ lib/portage/package/ebuild/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 1e2df4c0df919f62ba68ed1a9d43bcd855e074ee X-VCS-Branch: master Date: Sun, 3 Nov 2024 21:26:35 +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: 52e236ea-a1a3-4559-9897-67080b5a5d80 X-Archives-Hash: 43fe3e826604a40adc6b80e62af82546 commit: 1e2df4c0df919f62ba68ed1a9d43bcd855e074ee Author: Mike Gilbert gentoo org> AuthorDate: Wed Oct 30 20:11:34 2024 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Nov 3 21:26:02 2024 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1e2df4c0 Skip self update logic when installation.TYPE != SYSTEM If we are running from source (git) or as a module installed via pip, we don't need to worry about overwriting the existing system install via an ebuild installation. Signed-off-by: Mike Gilbert gentoo.org> lib/_emerge/Scheduler.py | 4 ++++ lib/portage/package/ebuild/doebuild.py | 16 ++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py index 283144b55a..fea151d5d1 100644 --- a/lib/_emerge/Scheduler.py +++ b/lib/_emerge/Scheduler.py @@ -17,6 +17,7 @@ import portage from portage import os from portage import _encodings from portage import _unicode_encode +from portage import installation from portage.cache.mappings import slot_dict_class from portage.elog.messages import eerror from portage.output import colorize, create_color_func, red @@ -339,6 +340,9 @@ class Scheduler(PollScheduler): ) def _handle_self_update(self): + if installation.TYPE != installation.TYPES.SYSTEM: + return os.EX_OK + if self._opts_no_self_update.intersection(self.myopts): return os.EX_OK diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py index b5fb46df70..47bd706c40 100644 --- a/lib/portage/package/ebuild/doebuild.py +++ b/lib/portage/package/ebuild/doebuild.py @@ -50,6 +50,7 @@ portage.proxy.lazyimport.lazyimport( from portage import ( bsd_chflags, eapi_is_supported, + installation, merge, os, selinux, @@ -3280,10 +3281,13 @@ def _prepare_self_update(settings): def _handle_self_update(settings, vardb): - cpv = settings.mycpv - if settings["ROOT"] == "/" and portage.dep.match_from_list( - portage.const.PORTAGE_PACKAGE_ATOM, [cpv] + if installation.TYPE != installation.TYPES.SYSTEM: + return False + if settings["ROOT"] != "/": + return False + if not portage.dep.match_from_list( + portage.const.PORTAGE_PACKAGE_ATOM, [settings.mycpv] ): - _prepare_self_update(settings) - return True - return False + return False + _prepare_self_update(settings) + return True