Ubuntu One Windows Installer

Merge lp:~brian.curtin/ubuntuone-windows-installer/local-cert-updates into lp:ubuntuone-windows-installer

  1. local-cert-updates
  2. Merge into trunk
Proposed by Brian Curtin
Status: Merged
Approved by: dobey
Approved revision: 170
Merged at revision: 172
Proposed branch: lp:~brian.curtin/ubuntuone-windows-installer/local-cert-updates
Merge into: lp:ubuntuone-windows-installer
Diff against target: 48 lines (+7/-7)
2 files modified
scripts/setup.py (+4/-4)
scripts/ubuntuone.xml (+3/-3)
To merge this branch: bzr merge lp:~brian.curtin/ubuntuone-windows-installer/local-cert-updates
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+163049@code.launchpad.net

Commit message

- Update the locations of where to find and store certificate files.

Description of the change

Once lp:~brian.curtin/ubuntu-sso-client/local-certs lands, we will need to look for the certificate files in a new place, and we also need to install them into a new place. They're going to be stored within SSO's data directory, and the installer should install them to the "ubuntuone" data folder instead of "ubuntuone-storageprotocol".

To post a comment you must log in.
Revision history for this message
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/setup.py'
2--- scripts/setup.py 2013-04-23 18:18:19 +0000
3+++ scripts/setup.py 2013-05-08 20:29:25 +0000
4@@ -274,17 +274,17 @@
5 with open(os.path.join("data", "revnos.txt"), "w+") as revnos:
6 revnos.write(revno_str)
7
8- # Copy storage-protocol's pem files
9+ # Copy SSO's pem files
10 shutil.copyfile(os.path.join("sources",
11- "ubuntuone-storage-protocol", "data",
12+ "ubuntu-sso-client", "data",
13 "UbuntuOne-Go_Daddy_CA.pem"),
14 os.path.join("data", "UbuntuOne-Go_Daddy_CA.pem"))
15 shutil.copyfile(os.path.join("sources",
16- "ubuntuone-storage-protocol", "data",
17+ "ubuntu-sso-client", "data",
18 "UbuntuOne-Go_Daddy_Class_2_CA.pem"),
19 os.path.join("data", "UbuntuOne-Go_Daddy_Class_2_CA.pem"))
20 shutil.copyfile(os.path.join("sources",
21- "ubuntuone-storage-protocol", "data",
22+ "ubuntu-sso-client", "data",
23 "UbuntuOne-ValiCert_Class_2_VA.pem"),
24 os.path.join("data", "UbuntuOne-ValiCert_Class_2_VA.pem"))
25
26
27=== modified file 'scripts/ubuntuone.xml'
28--- scripts/ubuntuone.xml 2013-01-31 23:48:06 +0000
29+++ scripts/ubuntuone.xml 2013-05-08 20:29:25 +0000
30@@ -352,15 +352,15 @@
31 <origin>${installdir}\data\update.conf</origin>
32 </copyFile>
33 <copyFile>
34- <destination>${windows_folder_common_appdata}\ubuntuone-storageprotocol</destination>
35+ <destination>${windows_folder_common_appdata}\ubuntuone</destination>
36 <origin>${installdir}\data\UbuntuOne-Go_Daddy_CA.pem</origin>
37 </copyFile>
38 <copyFile>
39- <destination>${windows_folder_common_appdata}\ubuntuone-storageprotocol</destination>
40+ <destination>${windows_folder_common_appdata}\ubuntuone</destination>
41 <origin>${installdir}\data\UbuntuOne-Go_Daddy_Class_2_CA.pem</origin>
42 </copyFile>
43 <copyFile>
44- <destination>${windows_folder_common_appdata}\ubuntuone-storageprotocol</destination>
45+ <destination>${windows_folder_common_appdata}\ubuntuone</destination>
46 <origin>${installdir}\data\UbuntuOne-ValiCert_Class_2_VA.pem</origin>
47 </copyFile>
48 <deleteFile>

Subscribers

People subscribed via source and target branches