diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-10-13 18:57:08 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-10-13 19:11:44 +0200 |
| commit | 2c6e7f6cf121446ef41f34e972aae205f233a191 (patch) | |
| tree | 47f74d0a11136a019c3ed9515d6449a8b529d4db /desktop/source | |
| parent | d3ae94f04e0cfeba49f5e0de66848743391fc336 (diff) | |
Log found extension updates
The OSL_ASSERT doesn't make any sense, if you don't know what it
compares. So simply log all found updates.
Change-Id: I002b65cf4a658036916a217a89d0df7f0168ee70
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/deployment/misc/dp_update.cxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx index b4c385c61cea..828fdff2143f 100644 --- a/desktop/source/deployment/misc/dp_update.cxx +++ b/desktop/source/deployment/misc/dp_update.cxx @@ -94,12 +94,13 @@ void getOwnUpdateInfos( Sequence<OUString> urls(i->second.extension->getUpdateInformationURLs()); if (urls.getLength()) { - const OUString id = dp_misc::getIdentifier(i->second.extension); + const OUString search_id = dp_misc::getIdentifier(i->second.extension); + SAL_INFO( "extensions.update", "Searching update for " << search_id ); uno::Any anyError; //It is unclear from the idl if there can be a null reference returned. //However all valid information should be the same Sequence<Reference< xml::dom::XElement > > - infos(getUpdateInformation(updateInformation, urls, id, anyError)); + infos(getUpdateInformation(updateInformation, urls, search_id, anyError)); if (anyError.hasValue()) out_errors.emplace_back(i->second.extension, anyError); @@ -110,15 +111,15 @@ void getOwnUpdateInfos( Reference< xml::dom::XNode >(infos[j], UNO_QUERY_THROW)); if (!infoset.hasDescription()) continue; - boost::optional< OUString > id2(infoset.getIdentifier()); - if (!id2) + boost::optional< OUString > result_id(infoset.getIdentifier()); + if (!result_id) continue; - OSL_ASSERT(*id2 == id); - if (*id2 == id) - { - i->second.version = infoset.getVersion(); - i->second.info.set(infos[j], UNO_QUERY_THROW); - } + SAL_INFO( "extensions.update", " found version " + << infoset.getVersion() << " for " << *result_id ); + if (*result_id != search_id) + continue; + i->second.version = infoset.getVersion(); + i->second.info.set(infos[j], UNO_QUERY_THROW); break; } } |