Merge lp://qastaging/~milo/linaro-image-tools/var-refactoring into lp://qastaging/linaro-image-tools/11.11
Proposed by
Milo Casagrande
| Status: | Merged |
|---|---|
| Approved by: | James Tunnicliffe |
| Approved revision: | 598 |
| Merged at revision: | 597 |
| Proposed branch: | lp://qastaging/~milo/linaro-image-tools/var-refactoring |
| Merge into: | lp://qastaging/linaro-image-tools/11.11 |
| Diff against target: |
174 lines (+31/-30) 2 files modified
linaro_image_tools/media_create/android_boards.py (+11/-11) linaro_image_tools/media_create/boards.py (+20/-19) |
| To merge this branch: | bzr merge lp://qastaging/~milo/linaro-image-tools/var-refactoring |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Tunnicliffe (community) | Approve | ||
| linaro-image-tools maintainers | Pending | ||
|
Review via email:
|
|||
Description of the change
A simple variable name refactoring in order to have the same name between boards.py and android_boards.py.
Tests do not need to be changed.
To post a comment you must log in.
Revision history for this message
| James Tunnicliffe (dooferlad) wrote | # |
Revision history for this message
| Milo Casagrande (milo) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks fine, though I wonder if it is worth picking up more:
46 @@ -547,7 +548,7 @@
47 lowmem_opt = ''
48 boot_snippet = 'root=%s' % rootfs_id
49 if is_live:
50 - serial_opts += ' %s' % self.live_
51 + serial_opts += ' %s' % self.live_
52 boot_snippet = 'boot=casper'
53 if is_lowmem:
54 lowmem_opt = 'only-ubiquity'
I would change the local serial_opts variable to be consistent. There are a few places in android_boards where serial_opts turns up as well.