Merge lp://staging/~jameinel/bzr/2.2-win32-include-fastimport-package into lp://staging/bzr/2.2
| Status: | Merged |
|---|---|
| Approved by: | Vincent Ladeuil |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 5132 |
| Proposed branch: | lp://staging/~jameinel/bzr/2.2-win32-include-fastimport-package |
| Merge into: | lp://staging/bzr/2.2 |
| Diff against target: |
26 lines (+9/-0) 1 file modified
setup.py (+9/-0) |
| To merge this branch: | bzr merge lp://staging/~jameinel/bzr/2.2-win32-include-fastimport-package |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Vincent Ladeuil | Approve | ||
|
Review via email:
|
|||
Commit message
When building the bzr executable, include python-fastimport as a package that needs to be bundled.
Description of the change
The 'bzr-fastimport' plugin now depends on the 'python-fastimport' module. We've had a few bugs talking about 'fastimport' not getting bundled with the bzr installers, and this should fix that.
As always, I don't like hacking bzr core code to handle distribution issues, but rewriting the setup.py infrastructure is still off the table. My 'quick hack' test shows that it worked for bzr-2.3 (I edited setup.py manually and ran 'python setup.py py2exe' and saw 'fastimport' show up in library.zip.)
I'm not going to block the bzr-2.3.3 installers on this, because it has been a bug for a while, so it isn't a regression.
The earliest installer using the new system is the bzr-2.2 series, so I'm proposing this there, and planning on merging it up into bzr-2.3 and bzr-2.4.
| John A Meinel (jameinel) wrote | # |
To keep the ball rolling, I'm approving this, but really, having to require a review for this kind of change is a burden for *you* and all people building the windows installers.
By the way, I think we won't build any 2.2 windows installers (we already stopped building them for OSX AFAIK) so you can just target 2.3 and merge in trunk.