Ubuntu One Windows Installer

Merge lp:~brian.curtin/ubuntuone-windows-installer/server2008-fix into lp:ubuntuone-windows-installer

  1. server2008-fix
  2. Merge into trunk
Proposed by Brian Curtin on 2012-05-23
Status: Merged
Approved by: dobey on 2012-05-23
Approved revision: 115
Merged at revision: 115
Proposed branch: lp:~brian.curtin/ubuntuone-windows-installer/server2008-fix
Merge into: lp:ubuntuone-windows-installer
Diff against target: 13 lines (+2/-1)
1 file modified
scripts/build_installer.py (+2/-1)
To merge this branch: bzr merge lp:~brian.curtin/ubuntuone-windows-installer/server2008-fix
Reviewer Review Type Date Requested Status
dobey (community) 2012-05-23 Approve on 2012-05-23
Review via email: mp+107121@code.launchpad.net

Commit Message

- Allow build_installer.py to work on Server 2008 for build automation.

Description of the Change

One liner to make installer builds work on the Jenkins machine, which runs Server 2008 and uses "My Documents" rather than "Documents" like Windows 7 does.

To post a comment you must log in.
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/build_installer.py'
2--- scripts/build_installer.py 2012-05-17 14:56:44 +0000
3+++ scripts/build_installer.py 2012-05-23 21:13:19 +0000
4@@ -40,7 +40,8 @@
5 user_dir = os.getenv("USERPROFILE")
6 if not user_dir:
7 return None
8- output = os.path.join(user_dir, "Documents", type, "output")
9+ folder = "My Documents" if "Windows-2008" in platform() else "Documents"
10+ output = os.path.join(user_dir, folder, type, "output")
11 return output if os.path.exists(output) else None
12
13 def _get_last_file(dir):

Subscribers

People subscribed via source and target branches