summaryrefslogtreecommitdiff
path: root/rtemstoolkit
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2015-12-11 17:01:51 +1100
committerChris Johns <chrisj@rtems.org>2015-12-11 17:01:51 +1100
commit3828e5033c9a251c2901e67c88e2ef2ea5f69a81 (patch)
treee94533aa972d3d059e43966fa0872040831dd784 /rtemstoolkit
parent8b49f734cb06b4862007c10695d19f7e2eebd758 (diff)
VERSION as an INI format file.
One section is supported [version] with a 'release' entry.
Diffstat (limited to 'rtemstoolkit')
-rw-r--r--rtemstoolkit/version.py19
1 files changed, 11 insertions, 8 deletions
diff --git a/rtemstoolkit/version.py b/rtemstoolkit/version.py
index df74510..542a8e0 100644
--- a/rtemstoolkit/version.py
+++ b/rtemstoolkit/version.py
@@ -42,7 +42,9 @@ import path
#
# Default to an internal string.
#
-_version_str = '4.12.not_release'
+_version = '4.12'
+_revision = 'not_released'
+_version_str = '%s.%s' % (_version, _revision)
_released = False
_git = False
@@ -56,12 +58,13 @@ def _load_released_version():
for ver in [at, path.join(at, '..')]:
if path.exists(path.join(ver, 'VERSION')):
try:
- with open(path.join(ver, 'VERSION')) as v:
- _version_str = v.readline().strip()
- v.close()
- _released = True
- except:
- raise error.general('Cannot access the VERSION file')
+ import configparser
+ except ImportError:
+ import ConfigParser as configparser
+ v = configparser.SafeConfigParser()
+ v.read(path.join(ver, 'VERSION'))
+ _version_str = v.get('version', 'release')
+ _released = True
return _released
def _load_git_version():
@@ -74,7 +77,7 @@ def _load_git_version():
modified = ' modified'
else:
modified = ''
- _version_str = '%s (%s%s)' % (_version_str, head[0:12], modified)
+ _version_str = '%s (%s%s)' % (_version, head[0:12], modified)
_git = True
return _git