[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-5.2' - 2 commits - configmgr/source instsetoo_native/CustomTarget_setup.mk

[Tor Lillqvist]

 configmgr/source/components.cxx        |    2 +-
 instsetoo_native/CustomTarget_setup.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 480f1bea944ffed9b68d1a2ce5fbdf120936c53b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Aug 5 14:47:32 2016 +0300

    Tell where the colon is missing in the exception message
    
    But sure, it would be surprising if the message was actually displayed
    even if the exception is caught and causes some failure
    somewhere... (See previous commit.)
    
    Change-Id: I7375b869d08a465d9720a619d5ef49a77c4782e5

diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 5b6271b..f395e7f 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -488,7 +488,7 @@ Components::Components(
         for (;; ++c) {
             if (c == conf.getLength() || conf[c] == ' ') {
                 throw css::uno::RuntimeException(
-                    "CONFIGURATION_LAYERS: missing \":\"");
+                    "CONFIGURATION_LAYERS: missing ':' in \"" + conf + "\"");
             }
             if (conf[c] == ':') {
                 break;
commit d423c43786df832aead1fac1df2cc44eaeb7a11a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Aug 5 14:42:37 2016 +0300

    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

diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index a8d56a3..173a8c6 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/..') \
 	) > $@