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

[Brian Curtin]

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

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".

[dobey (dobey)]

review: Approve

=== modified file 'scripts/setup.py'
--- scripts/setup.py	2013-04-23 18:18:19 +0000
+++ scripts/setup.py	2013-05-08 20:29:25 +0000
@@ -274,17 +274,17 @@
         with open(os.path.join("data", "revnos.txt"), "w+") as revnos:
             revnos.write(revno_str)
 
-        # Copy storage-protocol's pem files
+        # Copy SSO's pem files
         shutil.copyfile(os.path.join("sources",
-            "ubuntuone-storage-protocol", "data",
+            "ubuntu-sso-client", "data",
             "UbuntuOne-Go_Daddy_CA.pem"),
             os.path.join("data", "UbuntuOne-Go_Daddy_CA.pem"))
         shutil.copyfile(os.path.join("sources",
-            "ubuntuone-storage-protocol", "data",
+            "ubuntu-sso-client", "data",
             "UbuntuOne-Go_Daddy_Class_2_CA.pem"),
             os.path.join("data", "UbuntuOne-Go_Daddy_Class_2_CA.pem"))
         shutil.copyfile(os.path.join("sources",
-            "ubuntuone-storage-protocol", "data",
+            "ubuntu-sso-client", "data",
             "UbuntuOne-ValiCert_Class_2_VA.pem"),
             os.path.join("data", "UbuntuOne-ValiCert_Class_2_VA.pem"))
 
 
=== modified file 'scripts/ubuntuone.xml'
--- scripts/ubuntuone.xml	2013-01-31 23:48:06 +0000
+++ scripts/ubuntuone.xml	2013-05-08 20:29:25 +0000
@@ -352,15 +352,15 @@
             <origin>${installdir}\data\update.conf</origin>
         </copyFile>
         <copyFile>
-            <destination>${windows_folder_common_appdata}\ubuntuone-storageprotocol</destination>
+            <destination>${windows_folder_common_appdata}\ubuntuone</destination>
             <origin>${installdir}\data\UbuntuOne-Go_Daddy_CA.pem</origin>
         </copyFile>
         <copyFile>
-            <destination>${windows_folder_common_appdata}\ubuntuone-storageprotocol</destination>
+            <destination>${windows_folder_common_appdata}\ubuntuone</destination>
             <origin>${installdir}\data\UbuntuOne-Go_Daddy_Class_2_CA.pem</origin>
         </copyFile>
         <copyFile>
-            <destination>${windows_folder_common_appdata}\ubuntuone-storageprotocol</destination>
+            <destination>${windows_folder_common_appdata}\ubuntuone</destination>
             <origin>${installdir}\data\UbuntuOne-ValiCert_Class_2_VA.pem</origin>
         </copyFile>
         <deleteFile>