Code review comment for lp:~brian.curtin/ubuntuone-storage-protocol/get_cert_location-removal

Revision history for this message
dobey (dobey) wrote :

14 === modified file 'setup.py'
15 --- setup.py 2012-12-03 19:45:43 +0000
16 +++ setup.py 2013-05-22 21:39:27 +0000
17 @@ -26,7 +26,7 @@
18 from distutils.core import setup
19 from distutils.spawn import find_executable
20 from distutils.command import clean, build
21 -from ubuntuone.storageprotocol.context import get_cert_location
22 +from ubuntu_sso.utils import get_cert_dir
23
24
25 class StorageProtocolBuild(build.build):
26 @@ -74,7 +74,7 @@
27 packages=['ubuntuone',
28 'ubuntuone.storageprotocol'],
29 extra_path='ubuntuone-storage-protocol',
30 - data_files=[(get_cert_location(),
31 + data_files=[(get_cert_dir(),
32 ['data/UbuntuOne-Go_Daddy_CA.pem',
33 'data/UbuntuOne-ValiCert_Class_2_VA.pem',
34 'data/UbuntuOne-Go_Daddy_Class_2_CA.pem'])],
35

sso-client and storage-protocol can't both be installing the same files to the same place. These files will need to be removed from this tree, and not installed at all.

« Back to merge proposal