Changeset 72a4249 in examples-v2


Ignore:
Timestamp:
Dec 4, 2013, 9:37:12 AM (5 years ago)
Author:
Chirayu Desai <cdesai@…>
Branches:
4.11, 286403d7a3d0e521179e677c0d2fd7549c9ceab4
Children:
4ada4d0
Parents:
c5a73cc
git-author:
Chirayu Desai <cdesai@…> (12/04/13 09:37:12)
git-committer:
Gedare Bloom <gedare@…> (12/12/13 19:55:56)
Message:

waf: Add null check for rtems_tools

If 'waf configure' is called without --rtems-tools, it'll be set to
None, leading to a TypeError?.

Traceback (most recent call last):

File "/home/cdesai/bin/.waf-1.7.13-8c328f55ac27cdb03b8c949f189bbac3/waflib/Scripting.py", line 97, in waf_entry_point

run_commands()

File "/home/cdesai/bin/.waf-1.7.13-8c328f55ac27cdb03b8c949f189bbac3/waflib/Scripting.py", line 153, in run_commands

ctx=run_command(cmd_name)

File "/home/cdesai/bin/.waf-1.7.13-8c328f55ac27cdb03b8c949f189bbac3/waflib/Scripting.py", line 146, in run_command

ctx.execute()

File "/home/cdesai/bin/.waf-1.7.13-8c328f55ac27cdb03b8c949f189bbac3/waflib/Configure.py", line 128, in execute

super(ConfigurationContext?,self).execute()

File "/home/cdesai/bin/.waf-1.7.13-8c328f55ac27cdb03b8c949f189bbac3/waflib/Context.py", line 87, in execute

self.recurse([os.path.dirname(g_module.root_path)])

File "/home/cdesai/bin/.waf-1.7.13-8c328f55ac27cdb03b8c949f189bbac3/waflib/Context.py", line 128, in recurse

user_function(self)

File "/home/cdesai/rtems/examples-v2/wscript", line 29, in configure

rtems.configure(conf)

File "/home/cdesai/rtems/examples-v2/rtems_waf/rtems.py", line 158, in configure

tools = _find_tools(conf, arch, [rtems_path] + rtems_tools, tools)

TypeError?: can only concatenate list (not "NoneType?") to list

File:
1 edited

Legend:

Unmodified
Added
Removed
  • rtems_waf/rtems.py

    rc5a73cc r72a4249  
    134134                                                              conf.options.rtems_archs,
    135135                                                              conf.options.rtems_bsps)
     136
     137    if rtems_tools is None:
     138        conf.fatal('RTEMS tools not found.')
    136139
    137140    _log_header(conf)
Note: See TracChangeset for help on using the changeset viewer.