diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2018-02-21 17:32:06 +0000 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2018-02-21 17:32:06 +0000 |
| commit | e55fcbeeee1d1000d06b64ef9f07a7f871ce2d83 (patch) | |
| tree | ed1124591dbf764da859840e73bf796af9dfca27 /indra/newview/viewer_manifest.py | |
| parent | 4c37033157516f836446d3d2a264ffe455644c36 (diff) | |
MAINT-8297 Removing old ca bundle
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 493bfac632..541112a765 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -87,7 +87,6 @@ class ViewerManifest(LLManifest): pkgdir = os.path.join(self.args['build'], os.pardir, 'packages') with self.prefix(src=pkgdir,dst=""): self.path("dictionaries") - self.path("ca-bundle.crt") # include the extracted packages information (see BuildPackagesInfo.cmake) self.path(src=os.path.join(self.args['build'],"packages-info.txt"), dst="packages-info.txt") @@ -593,9 +592,8 @@ class WindowsManifest(ViewerManifest): self.path(src="licenses-win32.txt", dst="licenses.txt") self.path("featuretable.txt") - self.path("ca-bundle.crt") - with self.prefix(src=pkgdir,dst="app_settings"): + with self.prefix(src=pkgdir,dst=""): self.path("ca-bundle.crt") # Media plugins - CEF @@ -1053,9 +1051,8 @@ open "%s" --args "$@" self.path("licenses-mac.txt", dst="licenses.txt") self.path("featuretable_mac.txt") self.path("SecondLife.nib") - self.path("ca-bundle.crt") - with self.prefix(src=pkgdir,dst="app_settings"): + with self.prefix(src=pkgdir,dst=""): self.path("ca-bundle.crt") self.path("SecondLife.nib") @@ -1514,9 +1511,8 @@ class LinuxManifest(ViewerManifest): print "Skipping llcommon.so (assuming llcommon was linked statically)" self.path("featuretable_linux.txt") - self.path("ca-bundle.crt") - with self.prefix(src=pkgdir,dst="app_settings"): + with self.prefix(src=pkgdir,dst=""): self.path("ca-bundle.crt") def package_finish(self): |