Ubuntu One Windows Installer

Merge lp:~dobey/ubuntuone-windows-installer/fix-jenkins into lp:ubuntuone-windows-installer

  1. fix-jenkins
  2. Merge into trunk
Proposed by dobey on 2012-09-05
Status: Merged
Approved by: Brian Curtin on 2012-09-05
Approved revision: 137
Merged at revision: 137
Proposed branch: lp:~dobey/ubuntuone-windows-installer/fix-jenkins
Merge into: lp:ubuntuone-windows-installer
Diff against target: 43 lines (+6/-5)
3 files modified
scripts/setup-mac.py (+3/-2)
scripts/setup.py (+2/-2)
scripts/ubuntuone.xml (+1/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-windows-installer/fix-jenkins
Reviewer Review Type Date Requested Status
Brian Curtin (community) Approve on 2012-09-05
Roberto Alsina (community) 2012-09-05 Approve on 2012-09-05
Review via email: mp+122928@code.launchpad.net

Commit Message

Fix the build to reference the right ValiCert pem file

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

setup-mac changes work for me. saving approval for brian

Brian Curtin (brian.curtin) wrote :

Works on Windows as well.

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-28 18:38:05 +0000
3+++ scripts/setup-mac.py 2012-09-05 19:16:18 +0000
4@@ -411,8 +411,9 @@
5 os.path.join("data", "UbuntuOne-Go_Daddy_Class_2_CA.pem"))
6 shutil.copyfile(os.path.join(self.source_dir,
7 "ubuntuone-storage-protocol", "data",
8- "ValiCert_Class_2_VA.pem"),
9- os.path.join("data", "ValiCert_Class_2_VA.pem"))
10+ "UbuntuOne-ValiCert_Class_2_VA.pem"),
11+ os.path.join("data",
12+ "UbuntuOne-ValiCert_Class_2_VA.pem"))
13
14 # Copy syncdaemon config data
15 shutil.copyfile(os.path.join(self.source_dir,
16
17=== modified file 'scripts/setup.py'
18--- scripts/setup.py 2012-06-15 17:41:23 +0000
19+++ scripts/setup.py 2012-09-05 19:16:18 +0000
20@@ -269,8 +269,8 @@
21 os.path.join("data", "UbuntuOne-Go_Daddy_Class_2_CA.pem"))
22 shutil.copyfile(os.path.join("sources",
23 "ubuntuone-storage-protocol", "data",
24- "ValiCert_Class_2_VA.pem"),
25- os.path.join("data", "ValiCert_Class_2_VA.pem"))
26+ "UbuntuOne-ValiCert_Class_2_VA.pem"),
27+ os.path.join("data", "UbuntuOne-ValiCert_Class_2_VA.pem"))
28
29 # Copy syncdaemon config data
30 shutil.copyfile(os.path.join("sources",
31
32=== modified file 'scripts/ubuntuone.xml'
33--- scripts/ubuntuone.xml 2012-06-15 17:41:23 +0000
34+++ scripts/ubuntuone.xml 2012-09-05 19:16:18 +0000
35@@ -298,7 +298,7 @@
36 </copyFile>
37 <copyFile>
38 <destination>${windows_folder_common_appdata}\ubuntuone-storageprotocol</destination>
39- <origin>${installdir}\data\ValiCert_Class_2_VA.pem</origin>
40+ <origin>${installdir}\data\UbuntuOne-ValiCert_Class_2_VA.pem</origin>
41 </copyFile>
42 <deleteFile>
43 <path>c:\install.exe</path>

Subscribers

People subscribed via source and target branches