diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-03-13 20:11:51 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-03-13 20:11:51 (GMT) |
| commit | f0d0c5d4aab1aa2fb685650d3806a7ee577db3d9 (patch) | |
| tree | 8f2832372b8dff16a256fe85856cb067063c4f85 | |
| parent | 1668a5976917e04d2d3349d9b2b0e4580676936f (diff) | |
| parent | 884bb12d7f4e3dc70e16ca9edfa807c4179bb9bb (diff) | |
| download | SCons-f0d0c5d4aab1aa2fb685650d3806a7ee577db3d9.zip SCons-f0d0c5d4aab1aa2fb685650d3806a7ee577db3d9.tar.gz SCons-f0d0c5d4aab1aa2fb685650d3806a7ee577db3d9.tar.bz2 | |
merge heads
| -rw-r--r-- | QMTest/TestSCons.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/SConf.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index f75a3cc..8d53e11 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -1013,7 +1013,7 @@ SConscript( sconscript ) nols = nols + "|" nols = nols + ")" lastEnd = 0 - logfile = self.read(self.workpath(logfile)) + logfile = self.read(self.workpath(logfile),mode='r') if (doCheckLog and logfile.find( "scons: warning: The stored build " "information has an unexpected class." ) >= 0): diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py index c68d1c6..31d9402 100644 --- a/src/engine/SCons/SConf.py +++ b/src/engine/SCons/SConf.py @@ -643,7 +643,7 @@ class SConfBase(object): node = self.env.Command(output, prog, [ [ pname, ">", "${TARGET}"] ]) ok = self.BuildNodes(node) if ok: - outputStr = output.get_contents() + outputStr = SCons.Util.to_str(output.get_contents()) return( 1, outputStr) return (0, "") |