diff --git a/AUTHOR b/AUTHOR index 1a1c06ae366c0cc8a0f49ac194bab60894011252..b2501296de33cce7b5e8791c337120fe5d758639 100644 --- a/AUTHOR +++ b/AUTHOR @@ -2,4 +2,5 @@ Paul McCarthy <pauldmccarthy@gmail.com> Michiel Cottaar <michiel.cottaar@ndcn.ox.ac.uk> Matthew Webster <matthew.webster@ndcn.ox.ac.uk> Sean Fitzgibbon <sean.fitzgibbon@ndcn.ox.ac.uk> -Martin Craig <martin.craig@eng.ox.ac.uk> \ No newline at end of file +Martin Craig <martin.craig@eng.ox.ac.uk> +Taylor Hanayik <taylor.hanayik@ndcn.ox.ac.uk> \ No newline at end of file diff --git a/fsl/utils/platform.py b/fsl/utils/platform.py index 1d33d80b111fdc06536c015455a4d010335f4e89..04ffb98d6b0aafcdd9c2ce6ebd62301b2c091ebd 100644 --- a/fsl/utils/platform.py +++ b/fsl/utils/platform.py @@ -287,7 +287,10 @@ class Platform(notifier.Notifier): if op.exists(versionFile): with open(versionFile, 'rt') as f: - self.__fslVersion = f.read().strip() + # split string at colon for new hash style versions + # first object in list is the non-hashed version string (e.g. 6.0.2) + # if no ":hash:" then standard FSL version string is still returned + self.__fslVersion = f.read().strip().split(":")[0] self.notify(value=value) diff --git a/tests/test_platform.py b/tests/test_platform.py index 67aefe094bedd91c19772c3d842841134faa07f8..a747ac03a3ae0d72fc0bc9397da0aa2a10afd613 100644 --- a/tests/test_platform.py +++ b/tests/test_platform.py @@ -161,7 +161,7 @@ def test_fsldir(): def makeFSL(): os.makedirs(op.join(fsldir, 'etc')) with open(op.join(fsldir, 'etc', 'fslversion'), 'wt') as f: - f.write('Dummy FSL\n') + f.write('6.0.2:7606e0d8\n') try: @@ -182,7 +182,7 @@ def test_fsldir(): assert os.environ['FSLDIR'] == fsldir assert newFSLDir[0] == fsldir assert p.fsldir == fsldir - assert p.fslVersion == 'Dummy FSL' + assert p.fslVersion == '6.0.2' finally: shutil.rmtree(testdir)