Merge lp:~mikemc/ubuntuone-windows-installer/package-everything into lp:ubuntuone-windows-installer
Status: | Merged | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Manuel de la Peña | ||||||||||||
Approved revision: | 134 | ||||||||||||
Merged at revision: | 127 | ||||||||||||
Proposed branch: | lp:~mikemc/ubuntuone-windows-installer/package-everything | ||||||||||||
Merge into: | lp:ubuntuone-windows-installer | ||||||||||||
Diff against target: |
462 lines (+253/-92) 1 file modified
scripts/setup-mac.py (+253/-92) |
||||||||||||
To merge this branch: | bzr merge lp:~mikemc/ubuntuone-windows-installer/package-everything | ||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Manuel de la Peña (community) | Approve | ||
Alejandro J. Cura (community) | Approve | ||
Review via email: mp+115596@code.launchpad.net |
Commit message
- Package all helper apps, use symlinks to share resources (LP: #1025342)
Description of the change
- Package all helper apps, use symlinks to share resources (LP: #1025342)
This also includes a couple other changes, including some code cleanup.
NOTE to testers:
The script currently expects to be run from a branch of ubuntuone-
That is fixed, but saved for a future merge.
To run with successful feelings, you need PYTHONPATH to include:
- a built copy of lp:~diego.sarmentero/+junk/python-macfsevents
- current trunk dirspec
- the same directory as setup-mac.py (to get conf.py)
- current trunk of ubuntu-sso-client, ubuntuone-client, and ubuntuone-
You will also need to run setup-mac using the buildout python.
To run the resulting executable, you can do the following:
% XDG_DATA_
However, with current trunk of storage-protocol as of this writing, you will see errors trying to find the SSL certs in /etc/ssl. See bug #1025950 for progress on that issue.
I'll leave the actual approval to someone who has knowledge of the deeper Mac things in here, so just entering as a comment for now, but on the surface nothing jumps out as being incorrect as just general Python code.
99 + print "WARNING: got OSError %r in rmtree(%r)." \ join(INSTALL_ DIR, "lib"))
100 + % (e, os.path.
Could you wrap this in parentheses rather than using the '\' line continuation?