[Libreoffice-commits] core.git: desktop/source

[Stephan Bergmann]

 desktop/source/deployment/manager/dp_manager.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 8bf2052de8516a76926b7885621ec001616018fc
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 5 09:31:29 2013 +0100

    Improve debug output
    
    Change-Id: Ia09e61a37bc485509c604df9279275003050d916

diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index bc286bf..72b3413 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -1363,6 +1363,8 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
                     url, OUString(), false, OUString(), xCmdEnv );
                 if (xPackage.is())
                 {
+                    OUString id = dp_misc::getIdentifier( xPackage );
+
                     //Prepare the database entry
                     ActivePackages::Data dbData;
 
@@ -1373,11 +1375,10 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
                         dbData.fileName = title;
                     dbData.mediaType = xPackage->getPackageType()->getMediaType();
                     dbData.version = xPackage->getVersion();
-                    OSL_ENSURE(!dbData.version.isEmpty(),
-                               "Extension Manager: bundled and shared extensions must have "
-                               "an identifier and a version");
-
-                    OUString id = dp_misc::getIdentifier( xPackage );
+                    SAL_WARN_IF(
+                        dbData.version.isEmpty(), "desktop.deployment",
+                        "bundled/shared extension " << id << " at <" << url
+                            << "> has no explicit version");
 
                     //We provide a special command environment that will prevent
                     //showing a license if simple-licens/@accept-by = "admin"