Merge lp://staging/~sinzui/juju-release-tools/build-in-lxc-2 into lp://staging/juju-release-tools
| Status: | Merged |
|---|---|
| Merged at revision: | 183 |
| Proposed branch: | lp://staging/~sinzui/juju-release-tools/build-in-lxc-2 |
| Merge into: | lp://staging/juju-release-tools |
| Diff against target: |
231 lines (+80/-26) 2 files modified
build_package.py (+26/-15) tests/test_build_package.py (+54/-11) |
| To merge this branch: | bzr merge lp://staging/~sinzui/juju-release-tools/build-in-lxc-2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Packman (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Add ppa support to build_package.py
The current builders can have ppas, so we need to support this in lxc building too. I first tried apt-add-repository, but that added 35M's to the downloaded packages, and I was seeing apt async issues again. I decided to simply append the apt line to /etc/apt/
.build_
I also addressed my concern about the lxc script doing cleanup. I moved the ownership and permission rules into python's flow control. I am very happy with the state of the workspace after a build completes (in both success and fail states).
Looks like a good step forward, provided you add some comments for the surprising aspects.
I don't get what was wrong with apt-add-repository, which would handle the key stuff and mean we didn't need --force-yes. I feel we should go back and work out what's up with command ordering later. So, a comment on the echo into sources.list and one on the ppa expansion seems reasonable.