Merge lp:~mwaddel/linaro-image-tools/null-string-vexpress into lp:linaro-image-tools/11.11
Proposed by
Matt Waddel
Status: | Merged |
---|---|
Merged at revision: | 309 |
Proposed branch: | lp:~mwaddel/linaro-image-tools/null-string-vexpress |
Merge into: | lp:linaro-image-tools/11.11 |
Diff against target: |
130 lines (+17/-16) 1 file modified
linaro_image_tools/media_create/boards.py (+17/-16) |
To merge this branch: | bzr merge lp:~mwaddel/linaro-image-tools/null-string-vexpress |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Guilherme Salgado (community) | Approve | ||
Review via email: mp+56028@code.launchpad.net |
Description of the change
The call to make_boot_files() fails when boot_script_path isn't initialized. This happens in the Versatile Express because the boot script isn't used on this platform.
To post a comment you must log in.
On Sat, Apr 02, 2011, Matt Waddel wrote: join(boot_ disk, cls.boot_script)
> + if cls.boot_script:
> + boot_script_path = os.path.
> + else:
> + boot_script_path = ''
Can we make it None instead? '' + 'boot.scr' might actually work and
result in either '/boot.scr' on the host or 'boot.scr' in the current
working directory on the host, so I prefer we use None just in case
Perhaps something like: script_ path = None
boot_script_ path = os.path. join(boot_ disk, cls.boot_script)
boot_
if cls.boot_script:
--
Loïc Minier