diff options
| author | Chris Johns <chrisj@rtems.org> | 2016-02-29 10:13:11 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2016-02-29 10:13:11 +1100 |
| commit | 23191a38807e31879161a563c32136380036d86a (patch) | |
| tree | 4d6def7cef3335f59215534d8a8abd3e5270f6a5 | |
| parent | config: Patch automake-1.12.6 to remove warning on newer perl versions. (diff) | |
| download | rtems-source-builder-23191a38807e31879161a563c32136380036d86a.tar.bz2 | |
sb: bootstrap.py clearing of environ var 'ACLOCAL_PATH' on MSYS2 fails.
With a recent (Feb 2016) pytnon on MSYS2 the clear fails so delete
the variable.
Update #2613.
| -rw-r--r-- | source-builder/sb/bootstrap.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source-builder/sb/bootstrap.py b/source-builder/sb/bootstrap.py index 42ce4dc..2e585c2 100644 --- a/source-builder/sb/bootstrap.py +++ b/source-builder/sb/bootstrap.py @@ -1,6 +1,6 @@ # # RTEMS Tools Project (http://www.rtems.org/) -# Copyright 2013 Chris Johns (chrisj@rtems.org) +# Copyright 2013-2016 Chris Johns (chrisj@rtems.org) # All rights reserved. # # This file is part of the RTEMS Tools package in 'rtems-tools'. @@ -255,7 +255,14 @@ def run(args): if 'msys' in cspath[0] and cspath[0].endswith('bin'): os.environ['PATH'] = os.pathsep.join(cspath[1:]) if 'ACLOCAL_PATH' in os.environ: - os.environ['ACLOCAL_PATH'].clear() + # + # The clear fails on a current MSYS2 python (Feb 2016). Delete + # the entry if the clear fails. + # + try: + os.environ['ACLOCAL_PATH'].clear() + except: + del os.environ['ACLOCAL_PATH'] optargs = { '--rtems': 'The RTEMS source directory', '--preinstall': 'Preinstall AM generation' } log.notice('RTEMS Source Builder - RTEMS Bootstrap, %s' % (version.str())) |