Ubuntu One Windows Installer

Merge lp:~mikemc/ubuntuone-windows-installer/fix-import-sso-constants into lp:ubuntuone-windows-installer

  1. fix-import-sso-constants
  2. Merge into trunk
Proposed by Mike McCracken on 2012-11-21
Status: Merged
Approved by: Mike McCracken on 2012-11-26
Approved revision: 149
Merged at revision: 151
Proposed branch: lp:~mikemc/ubuntuone-windows-installer/fix-import-sso-constants
Merge into: lp:ubuntuone-windows-installer
Prerequisite: lp:~mikemc/ubuntuone-windows-installer/space-and-version-bump
Diff against target: 15 lines (+4/-1)
1 file modified
scripts/setup-mac.py (+4/-1)
To merge this branch: bzr merge lp:~mikemc/ubuntuone-windows-installer/fix-import-sso-constants
Reviewer Review Type Date Requested Status
Roberto Alsina (community) 2012-11-21 Approve on 2012-11-21
Review via email: mp+135283@code.launchpad.net

Commit Message

- explicitly add ubuntu_sso.constants to py2app calls so it gets picked up.

Description of the Change

- explicitly add ubuntu_sso.constants to py2app calls so it gets picked up.

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-11-21 00:09:31 +0000
3+++ scripts/setup-mac.py 2012-11-21 00:09:31 +0000
4@@ -519,7 +519,10 @@
5 'sip',
6 'twisted.web.resource',
7 'twisted.web.client',
8- 'oauth'
9+ 'oauth',
10+ # workaround for indirect import in
11+ # utils/__init__.py:
12+ 'ubuntu_sso.constants'
13 ],
14 "packages": ["configglue"],
15 "excludes": ["fsm", "PyQt4.uic"],

Subscribers

People subscribed via source and target branches