Changeset 23191a3 in rtems-source-builder for source-builder/sb/bootstrap.py


Ignore:
Timestamp:
Feb 28, 2016, 11:13:11 PM (4 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, 4.9, master
Children:
8dbb3a0
Parents:
4b0baed
Message:

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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • source-builder/sb/bootstrap.py

    r4b0baed r23191a3  
    11#
    22# RTEMS Tools Project (http://www.rtems.org/)
    3 # Copyright 2013 Chris Johns (chrisj@rtems.org)
     3# Copyright 2013-2016 Chris Johns (chrisj@rtems.org)
    44# All rights reserved.
    55#
     
    256256                os.environ['PATH'] = os.pathsep.join(cspath[1:])
    257257            if 'ACLOCAL_PATH' in os.environ:
    258                 os.environ['ACLOCAL_PATH'].clear()
     258                #
     259                # The clear fails on a current MSYS2 python (Feb 2016). Delete
     260                # the entry if the clear fails.
     261                #
     262                try:
     263                    os.environ['ACLOCAL_PATH'].clear()
     264                except:
     265                    del os.environ['ACLOCAL_PATH']
    259266        optargs = { '--rtems':       'The RTEMS source directory',
    260267                    '--preinstall':  'Preinstall AM generation' }
Note: See TracChangeset for help on using the changeset viewer.