summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2016-03-11 09:48:21 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-03-15 09:30:14 +0000
commitbf75c47b284f73165aa815ec96cef627c31ea0ab (patch)
tree6b402d4feb307eb77de8da3ece6dade537d48973
parent34a7b51ea482d4487d4fb8e61cde18aa1ff9b8ff (diff)
User-Agent: disable reporting of languages.
Nowadays we have them all, so it is big, non-useful data. Reviewed-on: https://gerrit.libreoffice.org/23143 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 2a9095570a2430568f5c5e1c91edd6a717e099a6) User-Agent: disable reporting of languages - also for installsets extends 2a9095570a2430568f5c5e1c91edd6a717e099a6 to not only apply to instdir, but also to packaged installers (that use data from scp2) (cherry picked from commit 6c47de46613b531bd975d073cf31c3fda6f8b8da) Change-Id: Ia08b863852e6a0916f30e2ecdc14eea4fafe2ab0 Reviewed-on: https://gerrit.libreoffice.org/23151 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--instsetoo_native/CustomTarget_setup.mk2
-rw-r--r--scp2/source/ooo/common_brand.scp2
2 files changed, 2 insertions, 2 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index e4cdd5330d36..a8d56a3beb38 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -143,7 +143,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'ReferenceOOoMajorMinor=4.1' \
&& echo 'UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US' \
&& echo 'UpdateURL=$(if $(ENABLE_ONLINE_UPDATE),http://update.libreoffice.org/check.php$(if $(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT)))' \
- && echo 'UpdateUserAgent=<PRODUCT> ($${buildid}; $${_OS}; $${_ARCH}; <OPTIONAL_OS_HW_DATA>BundledLanguages=$${AllLanguages})' \
+ && echo 'UpdateUserAgent=<PRODUCT> ($${buildid}; $${_OS}; $${_ARCH}; <OPTIONAL_OS_HW_DATA>)' \
&& echo 'Vendor=$(OOO_VENDOR)' \
) > $@
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 193355137395..8ee6d1cd7063 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -921,7 +921,7 @@ ProfileItem gid_Brand_Profileitem_Version_Useragent
Section = "Version";
Order = 17;
Key = "UpdateUserAgent";
- Value = "<PRODUCT> (${buildid}; ${_OS}; ${_ARCH}; BundledLanguages=${AllLanguages})";
+ Value = "<PRODUCT> (${buildid}; ${_OS}; ${_ARCH})";
End
ProfileItem gid_Brand_Profileitem_Version_Vendor