Merge lp://staging/~gary/launchpad/bug559128 into lp://staging/launchpad
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Gary Poster | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://staging/~gary/launchpad/bug559128 | ||||
| Merge into: | lp://staging/launchpad | ||||
| Diff against target: |
297 lines (+64/-23) 12 files modified
Makefile (+1/-0) buildout-templates/_pythonpath.py.in (+9/-3) buildout-templates/bin/combine-css.in (+8/-2) buildout-templates/bin/jstest.in (+7/-1) buildout-templates/bin/kill-test-services.in (+6/-1) buildout-templates/bin/lint.sh.in (+6/-4) buildout-templates/bin/retest.in (+2/-1) buildout-templates/bin/sprite-util.in (+7/-3) buildout-templates/bin/test.in (+12/-5) buildout-templates/bin/update-download-cache.in (+3/-1) buildout.cfg (+1/-0) versions.cfg (+2/-2) |
||||
| To merge this branch: | bzr merge lp://staging/~gary/launchpad/bug559128 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Francis J. Lacoste (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Switch most of the buildout-generated code to using relative paths, to address bug 559128
Description of the change
This branch switches most of the buildout-generated code to using relative paths, to address bug 559128. Better distribution of compiled eggs will be a better solution to the underlying causes, but for now this fixes the problem and gets closer to making builds themselves use relative paths.
To test this for the current use case, get this branch in a directory with a unique name (like "bug559128" and run ``make bin/buildout && bin/buildout``. You can then grep the results for the string "bug559128". I only see them in the tags and the i18n scripts, which deployment does not use.
As an aside, in the future, LOSAs might like to be able to build an entire tree and just sync them out. If you run make build, currently only mailman adds further absolute paths. We probably won't be able to address that until we switch to Mailman 3 (after Python 2.6) but then it might be very easy. Further, if you run ``make run`` then +config-
In any case, this branch accomplishes the relative path changes using new versions of z3c.recipe.
| Gary Poster (gary) wrote | # |
Looks good. I suppose we will QA this by removing the work-around from edge deployment config and seeing if the edge update breaks?