diff options
| author | Chris Johns <chrisj@rtems.org> | 2016-03-10 14:52:25 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2016-03-10 14:53:53 +1100 |
| commit | 29f23e04401c8d15b46b7153887b96559b713c12 (patch) | |
| tree | d7fffa1cae538578da0e3411af93b39862dc3e89 | |
| parent | sb: Add support to GDB to select a specific Python. (diff) | |
| download | rtems-source-builder-29f23e04401c8d15b46b7153887b96559b713c12.tar.bz2 | |
sb: Fix configparser import on Python2 in version.py.
Updates #2619.
| -rwxr-xr-x | source-builder/sb-set-builder | 2 | ||||
| -rw-r--r-- | source-builder/sb/version.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source-builder/sb-set-builder b/source-builder/sb-set-builder index 52e122b..561199e 100755 --- a/source-builder/sb-set-builder +++ b/source-builder/sb-set-builder @@ -24,8 +24,6 @@ import sys, os base = os.path.dirname(sys.argv[0]) sys.path.insert(0, base + '/sb') -import setbuilder - try: import setbuilder setbuilder.run() diff --git a/source-builder/sb/version.py b/source-builder/sb/version.py index 8b67b4e..07ab018 100644 --- a/source-builder/sb/version.py +++ b/source-builder/sb/version.py @@ -50,7 +50,10 @@ def _load_released_version_config(): top = _top() for ver in [top, '..']: if path.exists(path.join(ver, 'VERSION')): - import configparser + try: + import configparser + except ImportError: + import ConfigParser as configparser v = configparser.SafeConfigParser() v.read(path.join(ver, 'VERSION')) return v |