diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-23 16:55:05 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-23 16:55:05 +0200 |
| commit | d240a76169c685e488fe7352adec69d39c60ef9f (patch) | |
| tree | 144aeb4702d258b0cfaf99cffb9f21e94b026459 /src/engine/SCons/Tool/PharLapCommon.py | |
| parent | 6ca68f29862bc7cbe5428426eee600cb1f3c05c1 (diff) | |
| parent | c2d9eaeffe9d77d8d5087fb21a3256fde32047d4 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/engine/SCons/Tool/PharLapCommon.py')
| -rw-r--r-- | src/engine/SCons/Tool/PharLapCommon.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/PharLapCommon.py b/src/engine/SCons/Tool/PharLapCommon.py index 103e21c..623f2a8 100644 --- a/src/engine/SCons/Tool/PharLapCommon.py +++ b/src/engine/SCons/Tool/PharLapCommon.py @@ -29,7 +29,7 @@ Phar Lap ETS tool chain. Right now, this is linkloc and # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/PharLapCommon.py 103260fce95bf5db1c35fb2371983087d85dd611 2019-07-13 18:25:30 bdbaddog" +__revision__ = "src/engine/SCons/Tool/PharLapCommon.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan" import os import os.path @@ -79,7 +79,8 @@ def getPharLapVersion(): include_path = os.path.join(getPharLapPath(), os.path.normpath("include/embkern.h")) if not os.path.exists(include_path): raise SCons.Errors.UserError("Cannot find embkern.h in ETS include directory.\nIs Phar Lap ETS installed properly?") - mo = REGEX_ETS_VER.search(open(include_path, 'r').read()) + with open(include_path, 'r') as f: + mo = REGEX_ETS_VER.search(f.read()) if mo: return int(mo.group(1)) # Default return for Phar Lap 9.1 |