Merge lp://staging/~gary/launchpad/buildout into lp://staging/launchpad
Proposed by
Gary Poster
| Status: | Merged |
|---|---|
| Approved by: | Michael Hudson-Doyle |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 11480 |
| Proposed branch: | lp://staging/~gary/launchpad/buildout |
| Merge into: | lp://staging/launchpad |
| Diff against target: |
49 lines (+9/-5) 2 files modified
Makefile (+4/-1) versions.cfg (+5/-4) |
| To merge this branch: | bzr merge lp://staging/~gary/launchpad/buildout |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Hudson-Doyle | Approve | ||
|
Review via email:
|
|||
Commit message
Fix bug 627159, and upgrade some dependencies while we're at it.
Description of the change
bug 627159 was caused by --version being removed from the Makefile's call to bootstrap. This means that bootstrap doesn't know what version to use, and tries to go over the wire to figure out what to do.
This branch reinstates the --version argument. It adds comments in both places that the buildout version is specified.
I doublechecked that this solved the problem by disconnecting my machine from the network while I ran make. AOK.
It also updates some related dependencies while I was at it.
To post a comment you must log in.
Revision history for this message
| Gary Poster (gary) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good. I wonder if there's something in ec2 test we can do to make the build if we break this again.......