[gentoo-commits] proj/portage:master commit in: lib/portage/emaint/modules/merges/

[gentoo-commits] proj/portage:master commit in: lib/portage/emaint/modules/merges/

[Zac Medico]

commit:     f02e423914eab4f5740e109db222a23763b07af6
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  4 00:16:17 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 01:08:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=f02e4239

lib/portage/emaint/modules/merges/merges.py: fix unnecessary-semicolon

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/emaint/modules/merges/merges.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/portage/emaint/modules/merges/merges.py b/lib/portage/emaint/modules/merges/merges.py
index a2b70edb8..775dc59d2 100644
--- a/lib/portage/emaint/modules/merges/merges.py
+++ b/lib/portage/emaint/modules/merges/merges.py
@@ -1,4 +1,4 @@
-# Copyright 2005-2014 Gentoo Foundation
+# Copyright 2005-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import portage
@@ -93,7 +93,7 @@ class MergesHandler:
 	def __init__(self):
 		"""Create MergesHandler object."""
 		eroot = portage.settings['EROOT']
-		tracking_path = os.path.join(eroot, PRIVATE_PATH, 'failed-merges');
+		tracking_path = os.path.join(eroot, PRIVATE_PATH, 'failed-merges')
 		self._tracking_file = TrackingFile(tracking_path)
 		self._vardb_path = os.path.join(eroot, VDB_PATH)
 

[gentoo-commits] proj/portage:master commit in: lib/portage/emaint/modules/merges/

[Sam James]

commit:     38532fd9b8806e55a57625ba0b90b5010498c1f4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  2 08:28:17 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan  2 08:29:25 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=38532fd9

emaint: merges: fix TrackingFile for utf8_mode

Bug: https://bugs.gentoo.org/921181
Signed-off-by: Sam James <sam <AT> gentoo.org>

 lib/portage/emaint/modules/merges/merges.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/portage/emaint/modules/merges/merges.py b/lib/portage/emaint/modules/merges/merges.py
index 7c16b3e6c1..dec97f83ef 100644
--- a/lib/portage/emaint/modules/merges/merges.py
+++ b/lib/portage/emaint/modules/merges/merges.py
@@ -22,7 +22,9 @@ class TrackingFile:
         @param tracking_path: file path used to keep track of failed merges
         @type tracking_path: String
         """
-        self._tracking_path = _unicode_encode(tracking_path)
+        self._tracking_path = (
+            tracking_path if portage.utf8_mode else _unicode_encode(tracking_path)
+        )
 
     def save(self, failed_pkgs):
         """