Ubuntu One Windows Installer

Merge lp:~mikemc/ubuntuone-windows-installer/fix-1032294 into lp:ubuntuone-windows-installer

  1. fix-1032294
  2. Merge into trunk
Proposed by Mike McCracken on 2012-08-02
Status: Merged
Approved by: Mike McCracken on 2012-08-07
Approved revision: 131
Merged at revision: 131
Proposed branch: lp:~mikemc/ubuntuone-windows-installer/fix-1032294
Merge into: lp:ubuntuone-windows-installer
Prerequisite: lp:~mikemc/ubuntuone-windows-installer/fix-1032292
Diff against target: 11 lines (+1/-0)
1 file modified
scripts/setup-mac.py (+1/-0)
To merge this branch: bzr merge lp:~mikemc/ubuntuone-windows-installer/fix-1032294
Reviewer Review Type Date Requested Status
Brian Curtin (community) Approve on 2012-08-02
Roberto Alsina (community) 2012-08-02 Approve on 2012-08-02
Review via email: mp+117968@code.launchpad.net

Commit Message

- Include configglue wholesale to work around apparent py2app absolute import confusion (LP: #1032294)

Description of the Change

- Include configglue wholesale to work around apparent py2app absolute import confusion (LP: #1032294)

To test, run python setup-mac.py prepare py2app, and check that configglue/inischema/typed.py exists here:
dist/ubuntuone-control-panel-qt/UbuntuOne.app/Contents/Resources/lib/python2.7/configglue

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
1=== modified file 'scripts/setup-mac.py'
2--- scripts/setup-mac.py 2012-08-02 18:46:19 +0000
3+++ scripts/setup-mac.py 2012-08-02 18:46:19 +0000
4@@ -471,6 +471,7 @@
5 'twisted.web.client',
6 'oauth'
7 ],
8+ "packages": ["configglue"],
9 "excludes": ["fsm", "PyQt4.uic"],
10 "frameworks": dylib_paths,
11 "resources": data_files,

Subscribers

People subscribed via source and target branches