commit: f3527f37796ed994e4586bab3aebbcf509b1a434
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 11 02:45:36 2025 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Nov 11 02:46:16 2025 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f3527f37
atomic_ofstream: fix BytesWarning for umask_test_file
lib/portage/util/__init__.py:1526: BytesWarning: str() on a bytes instance
umask_test_file = f"{tmp_name}_umask_test"
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
lib/portage/util/__init__.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/portage/util/__init__.py b/lib/portage/util/__init__.py
index 55cd69c02e..6a6d0fbc04 100644
--- a/lib/portage/util/__init__.py
+++ b/lib/portage/util/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Gentoo Authors
+# Copyright 2004-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from portage.cache.mappings import UserDict
@@ -1523,7 +1523,10 @@ class atomic_ofstream(AbstractContextManager,
ObjectProxy):
try:
st = os.stat(real_name)
except FileNotFoundError:
- umask_test_file = f"{tmp_name}_umask_test"
+ if isinstance(tmp_name, bytes):
+ umask_test_file = tmp_name + b"_umask_test"
+ else:
+ umask_test_file = f"{tmp_name}_umask_test"
with open(umask_test_file, "w") as f:
st = os.fstat(f.fileno())
os.unlink(umask_test_file)
