Ubuntu One Windows Installer

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

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

This proposal supersedes a proposal from 2012-08-02.

Commit Message

- Fix default sources path. (LP: #1032290)

Description of the Change

- Fix default sources path (LP: #1032290)

To test: run python setup-mac.py prepare (using buildout python) from a branch of windows-installer that isn't inside another branch of windows-installer (which is crazy why would anyone do that).

Verify that it finds the sources in devsetup/parts and doesn't blow up.

To post a comment you must log in.
Roberto Alsina (ralsina) :
review: Approve

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:02:24 +0000
3+++ scripts/setup-mac.py 2012-08-02 18:02:24 +0000
4@@ -187,7 +187,7 @@
5 self.source_dir = 'sources'
6 else:
7 self.source_dir = os.path.join(os.path.dirname(__file__),
8- "../..")
9+ "devsetup", "parts")
10
11 if self.only_prepare is None:
12 # default is to do everything:

Subscribers

People subscribed via source and target branches