Merge lp://qastaging/~michael.nelson/mir/snappy-packaging-fix-makefile into lp://qastaging/~mir-team/mir/snappy-packaging
Proposed by
Michael Nelson
| Status: | Merged |
|---|---|
| Approved by: | Alan Griffiths |
| Approved revision: | 17 |
| Merged at revision: | 17 |
| Proposed branch: | lp://qastaging/~michael.nelson/mir/snappy-packaging-fix-makefile |
| Merge into: | lp://qastaging/~mir-team/mir/snappy-packaging |
| Diff against target: |
11 lines (+1/-1) 1 file modified
Makefile (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~michael.nelson/mir/snappy-packaging-fix-makefile |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel van Vugt | Approve | ||
| Alan Griffiths | Approve | ||
| Alexandros Frantzis (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix --complement option to cut (so it's not treated as another -c list option).
Description of the change
Without this I end up with:
[100%] Built target snappypreload64
make[3]: Leaving directory '/home/
make[2]: Leaving directory '/home/
make[1]: Leaving directory '/home/
cut: only one type of list may be specified
Try 'cut --help' for more information.
cd deb2snap && ./deb2snap -d 15.04 -n mir -v "snap1" --overlay ../overlay -p mir-demos -p mir-graphics-
./deb2snap: line 156: dpkg-architecture: command not found
Makefile:24: recipe for target 'snap' failed
make: *** [snap] Error 127
To post a comment you must log in.
Revision history for this message
| Daniel van Vugt (vanvugt) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good.