[gentoo-commits] proj/portage:master commit in: lib/portage/, /

[Zac Medico]

commit:     b55554b55f049f51eda31b191614f4a0b9b42374
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  8 22:30:08 2025 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jun  8 22:49:14 2025 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b55554b5

_global_updates: Skip if vardb lock raises PermissionDenied

Fixes: b6a2901f66b6 ("Support cross-root package moves")
Bug: https://bugs.gentoo.org/953449
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 NEWS                           | 3 ++-
 lib/portage/_global_updates.py | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 6102862563..06e49c850c 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,8 @@ Release notes take the form of the following optional 
categories:
 portage-3.0.69 (UNRELEASED)
 --------------
 
-TODO
+Bug fixes:
+* _global_updates: Skip if vardb lock raises PermissionDenied (bug #953449).
 
 portage-3.0.68 (2025-04-12)
 --------------

diff --git a/lib/portage/_global_updates.py b/lib/portage/_global_updates.py
index 82e0372eee..d67fd00e1e 100644
--- a/lib/portage/_global_updates.py
+++ b/lib/portage/_global_updates.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2023 Gentoo Authors
+# Copyright 2010-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import stat
@@ -6,7 +6,7 @@ import stat
 from portage import best, os
 from portage.const import WORLD_FILE
 from portage.data import secpass
-from portage.exception import DirectoryNotFound
+from portage.exception import DirectoryNotFound, PermissionDenied
 from portage.localization import _
 from portage.output import bold, colorize
 from portage.update import (
@@ -39,7 +39,10 @@ def _global_updates(root, trees, prev_mtimes, quiet=False, 
if_mtime_changed=True
         return False
 
     vardb = trees[root]["vartree"].dbapi
-    vardb.lock()
+    try:
+        vardb.lock()
+    except PermissionDenied:
+        return False
     try:
         return _do_global_updates(
             root,