Merge lp://qastaging/~mterry/snapcraft/arch-fixes into lp://qastaging/~snappy-dev/snapcraft/core
Proposed by
Michael Terry
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Michael Terry | ||||
Approved revision: | 119 | ||||
Merged at revision: | 117 | ||||
Proposed branch: | lp://qastaging/~mterry/snapcraft/arch-fixes | ||||
Merge into: | lp://qastaging/~snappy-dev/snapcraft/core | ||||
Diff against target: |
155 lines (+38/-6) 8 files modified
debian/control (+3/-0) integration-tests/data/assemble/binary1.after (+4/-0) integration-tests/data/assemble/package.yaml.after (+2/-1) integration-tests/data/assemble/snappy/package.yaml (+1/-1) integration-tests/units/jobs.pxu (+4/-0) snapcraft/cmds.py (+4/-0) snapcraft/common.py (+16/-0) snapcraft/yaml.py (+4/-4) |
||||
To merge this branch: | bzr merge lp://qastaging/~mterry/snapcraft/arch-fixes | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ricardo Salveti (community) | Approve | ||
Review via email:
|
Commit message
Include the multiarch triplet to LD_LIBRARY_PATH and set the 'architecture' key in package.yaml if not present for the user.
Description of the change
Include the multiarch triplet to LD_LIBRARY_PATH and set the 'architecture' key in package.yaml if not present for the user.
To post a comment you must log in.
(I dropped the 'ar gs' bit because quotes are not legal characters in a service stop field and we weren't actually generating a snap file in that test. I don't know how you are supposed to pass arguments with spaces. But that's not snapcraft's problem.)