Merge lp://staging/~sil2100/ubuntu-system-image/server-fix-pd-builds into lp://staging/ubuntu-system-image/server
Proposed by
Łukasz Zemczak
| Status: | Merged |
|---|---|
| Merged at revision: | 273 |
| Proposed branch: | lp://staging/~sil2100/ubuntu-system-image/server-fix-pd-builds |
| Merge into: | lp://staging/ubuntu-system-image/server |
| Diff against target: |
48 lines (+15/-5) 2 files modified
lib/systemimage/generators.py (+2/-1) lib/systemimage/tests/test_generators.py (+13/-4) |
| To merge this branch: | bzr merge lp://staging/~sil2100/ubuntu-system-image/server-fix-pd-builds |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Barry Warsaw (community) | Approve | ||
|
Review via email:
|
|||
Commit message
When generating the ubuntu bits, make sure that all the android touch 'hacks' are also executed for pd. Along with an unit test modification.
Description of the change
When generating the ubuntu bits, make sure that all the android touch 'hacks' are also executed for pd. Along with an unit test modification.
This is required to get the ubuntu-pd images working.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Since it's really not obvious that "pd" == "pocket-desktop", maybe add some comments? Unless the context (which isn't visible in the diff) makes it clear.
One other comment inlined.
Other than that, the diff on the face of it looks okay to me.