Ubuntu One storage protocol

Merge lp:~dobey/ubuntuone-storage-protocol/rename-valicert into lp:ubuntuone-storage-protocol

  1. rename-valicert
  2. Merge into trunk
Proposed by dobey on 2012-08-15
Status: Merged
Approved by: Roman Yepishev on 2012-08-16
Approved revision: 152
Merged at revision: 153
Proposed branch: lp:~dobey/ubuntuone-storage-protocol/rename-valicert
Merge into: lp:ubuntuone-storage-protocol
Diff against target: 24 lines (+2/-2)
2 files modified
setup.py (+1/-1)
ubuntuone/storageprotocol/context.py (+1/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-storage-protocol/rename-valicert
Reviewer Review Type Date Requested Status
Roman Yepishev (community) fieldtest Approve on 2012-08-16
Roberto Alsina (community) 2012-08-15 Approve on 2012-08-16
Review via email: mp+119802@code.launchpad.net

Commit Message

Rename the ValiCert file to be namespaced as UbuntuOne like the other certs

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

Works as expected.

review: Approve (fieldtest)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'data/ValiCert_Class_2_VA.pem' => 'data/UbuntuOne-ValiCert_Class_2_VA.pem'
2=== modified file 'setup.py'
3--- setup.py 2012-06-12 17:03:26 +0000
4+++ setup.py 2012-08-15 22:13:41 +0000
5@@ -76,7 +76,7 @@
6 extra_path='ubuntuone-storage-protocol',
7 data_files=[(ssl_cert_location,
8 ['data/UbuntuOne-Go_Daddy_CA.pem',
9- 'data/ValiCert_Class_2_VA.pem',
10+ 'data/UbuntuOne-ValiCert_Class_2_VA.pem',
11 'data/UbuntuOne-Go_Daddy_Class_2_CA.pem'])],
12
13 cmdclass={
14
15=== modified file 'ubuntuone/storageprotocol/context.py'
16--- ubuntuone/storageprotocol/context.py 2012-06-12 16:32:06 +0000
17+++ ubuntuone/storageprotocol/context.py 2012-08-15 22:13:41 +0000
18@@ -93,7 +93,7 @@
19 ca_file_2 = ssl.Certificate.loadPEM(file(os.path.join(ssl_cert_location,
20 'UbuntuOne-Go_Daddy_CA.pem'), 'r').read())
21 ca_file_3 = ssl.Certificate.loadPEM(file(os.path.join(ssl_cert_location,
22- 'ValiCert_Class_2_VA.pem'), 'r').read())
23+ 'UbuntuOne-ValiCert_Class_2_VA.pem'), 'r').read())
24 return [ca_file.original, ca_file_2.original, ca_file_3.original]
25
26

Subscribers

People subscribed via source and target branches