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

[Mike McCracken]

- Fix default sources path (LP: #1032290)

- 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.

Unmerged revisions

=== modified file 'scripts/setup-mac.py'
--- scripts/setup-mac.py	2012-07-25 20:02:01 +0000
+++ scripts/setup-mac.py	2012-08-02 17:55:22 +0000
@@ -70,9 +70,16 @@
 # bzr env assumes homebrew install:
 # This is necessary so we can run setup-mac with the buildout python,
 # which breaks the paths needed for bzr.
-BZR_PATH = "/usr/local/Cellar/bazaar/2.5.0/libexec/:/usr/local/bin:/usr/bin"
+# just grab the latest installed bzr:
+BZR_PATHS = sorted(glob.glob("/usr/local/Cellar/bazaar/*/libexec/"),
+                   reverse=True)
+if len(BZR_PATHS) < 1:
+    print "Could not find bzr in /usr/local/Cellar/bazaar."
+    sys.exit()
+
+BZR_PATH = BZR_PATHS[0] + ":/usr/local/bin:/usr/bin"
 BZR_ENV = os.environ.copy()
-BZR_ENV.update(dict(PYTHONPATH="/usr/local/Cellar/bazaar/2.5.0/libexec/",
+BZR_ENV.update(dict(PYTHONPATH=BZR_PATHS[0],
                     PATH=BZR_PATH))
 
 
@@ -180,7 +187,7 @@
                 self.source_dir = 'sources'
             else:
                 self.source_dir = os.path.join(os.path.dirname(__file__),
-                                               "../..")
+                                               "devsetup", "parts")
 
         if self.only_prepare is None:
             # default is to do everything: