diff options
author | SARL ENR 68 <david@david.david> | 2015-09-10 07:46:41 +0200 |
---|---|---|
committer | SARL ENR 68 <david@david.david> | 2015-09-10 07:46:41 +0200 |
commit | 8ded5b3bf8f5f432a9256a8e1da5a58794a78260 (patch) | |
tree | 746135011e31b593f5d06e6208c7ca5191da8abd /BuildManager/build.py | |
parent | e817a09cece47d553f1554c5c3d86db4ec7f780d (diff) | |
download | bm-8ded5b3bf8f5f432a9256a8e1da5a58794a78260.tar bm-8ded5b3bf8f5f432a9256a8e1da5a58794a78260.tar.gz bm-8ded5b3bf8f5f432a9256a8e1da5a58794a78260.tar.bz2 bm-8ded5b3bf8f5f432a9256a8e1da5a58794a78260.tar.xz bm-8ded5b3bf8f5f432a9256a8e1da5a58794a78260.zip |
Manual adaptation for python3
- by papoteur
Diffstat (limited to 'BuildManager/build.py')
-rw-r--r-- | BuildManager/build.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/BuildManager/build.py b/BuildManager/build.py index 4efe006..600d883 100644 --- a/BuildManager/build.py +++ b/BuildManager/build.py @@ -7,6 +7,7 @@ import sys, os import time import shutil import glob +import codecs __all__ = ["PackageBuilder"] @@ -203,7 +204,7 @@ def buildpkg(pkg, stage, unpack_dir, passtrough="", show_log=0, dryrun=0): (stagechar,pkg.builddir,tmppath,passtrough,pkg.spec) logger.debug("rpmbuild command: "+cmd) if not dryrun: - log = open(pkg.log, "w") + log = codecs.open(pkg.log, "w", 'utf-8', errors = "replace") pop = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) of = pop.stdout.fileno() @@ -211,7 +212,7 @@ def buildpkg(pkg, stage, unpack_dir, passtrough="", show_log=0, dryrun=0): status = pop.poll() if status is not None: break - data = os.read(of, 8192) + data = os.read(of, 8192).decode(sys.getfilesystemencoding()) log.write(data) log.flush() if show_log: |