diff options
| author |   Sam James <sam@gentoo.org> | 2024-01-02 08:28:17 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-01-02 08:29:25 +0000 |
| commit | 38532fd9b8806e55a57625ba0b90b5010498c1f4 (patch) | |
| tree | aadac0f2c1a14fdaa2c8d4d81dea0c7aa2c3acad | |
| parent | bintree: don't call trust helper unless bindb is writable (diff) | |
| download | portage-38532fd9b8806e55a57625ba0b90b5010498c1f4.tar.gz portage-38532fd9b8806e55a57625ba0b90b5010498c1f4.tar.bz2 portage-38532fd9b8806e55a57625ba0b90b5010498c1f4.zip | |
emaint: merges: fix TrackingFile for utf8_mode
Bug: https://bugs.gentoo.org/921181
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | lib/portage/emaint/modules/merges/merges.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/portage/emaint/modules/merges/merges.py b/lib/portage/emaint/modules/merges/merges.py index 7c16b3e6c..dec97f83e 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): """ |