Merge lp://staging/~gary/launchpad/ec2buildout into lp://staging/launchpad
Proposed by
Gary Poster
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Māris Fogels | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 10979 | ||||
| Proposed branch: | lp://staging/~gary/launchpad/ec2buildout | ||||
| Merge into: | lp://staging/launchpad | ||||
| Diff against target: |
31 lines (+1/-13) 2 files modified
setup.py (+1/-0) utilities/ec2 (+0/-13) |
||||
| To merge this branch: | bzr merge lp://staging/~gary/launchpad/ec2buildout | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Māris Fogels (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Make running ec2 from a symlink more robust by having buildout generate the entry script.
Description of the change
This makes it so that, if you always use ec2 from devel to try and get the latest and greatest version while running your branch, it actually gets the new code even if there's a _pythonpath.py locally.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I tested this locally, and it works as expected. bin/ec2 works, utilities/ec2 works, 'make clean && make' work, and it merges cleanly with devel.
r=mars