More fixes for UTF-8 characters in manifests files

OpenIndiana · Mar 10, 2020 · 12dd412 · 12dd412
1 parent 900da3c
commit 12dd412
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/modules/client/transport/transport.py b/src/modules/client/transport/transport.py
@@ -1686,7 +1686,7 @@ def _prefetch_manifests_list(self, mxfr, mlist, excludes=misc.EmptyI):
                                         continue
 
                                 try:
-                                        mf = open(dl_path)
+                                        mf = open(dl_path, "r", encoding="UTF-8")
                                         mcontent = mf.read()
                                         mf.close()
                                         manifest.FactoredManifest(fmri,
@@ -1776,7 +1776,7 @@ def _verify_manifest(self, fmri, mfstpath=None, content=None, pub=None):
                         return False
 
                 if mfstpath:
-                        mf = open(mfstpath)
+                        mf = open(mfstpath, "r", encoding="UTF-8")
                         mcontent = mf.read()
                         mf.close()
                 elif content is not None:

diff --git a/src/modules/manifest.py b/src/modules/manifest.py
@@ -1364,7 +1364,7 @@ def store(self, mfst_path):
                                     e.filename)
                         raise
 
-                mfile = os.fdopen(fd, "w")
+                mfile = os.fdopen(fd, "w", encoding="UTF-8")
 
                 #
                 # We specifically avoid sorting manifests before writing