summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-08-05 14:42:37 +0300
committerTor Lillqvist <tml@collabora.com>2016-08-05 15:25:54 +0300
commit336a9ec1c4801ab57264b264ead90e5c14451230 (patch)
tree129d0b11746ed42939b5cb2a07084c1f5ad8b403 /instsetoo_native
parenta40278562557828634886924c82f58e215be9756 (diff)
URI-encode spaces in PRODUCTNAME for UserInstallation
Failing to do this caused a mysterious uncaught exception in gengal, with no explanation printed. This turned out to be caused by the 'CONFIGURATION_LAYERS: missing ":"' exception thrown in configmgr, which was caused by the unencoded space confusing the parsing of the CONFIGURATION_LAYERS thing. Change-Id: I9c91819906c2e0dd434d9f96a04bc14c0e0408ed
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/CustomTarget_setup.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index a8d56a3beb38..173a8c6b9839 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -41,7 +41,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'InstallMode=<installmode>' \
&& echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \
$(if $(ENABLE_RELEASE_BUILD),\
- && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(PRODUCTNAME))/4', \
+ && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \
&& echo 'UserInstallation=$$ORIGIN/..') \
) > $@