Kaydet (Commit) 2c6e7f6c authored tarafından Jan-Marek Glogowski's avatar Jan-Marek Glogowski

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
üst d3ae94f0
...@@ -94,12 +94,13 @@ void getOwnUpdateInfos( ...@@ -94,12 +94,13 @@ void getOwnUpdateInfos(
Sequence<OUString> urls(i->second.extension->getUpdateInformationURLs()); Sequence<OUString> urls(i->second.extension->getUpdateInformationURLs());
if (urls.getLength()) 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; uno::Any anyError;
//It is unclear from the idl if there can be a null reference returned. //It is unclear from the idl if there can be a null reference returned.
//However all valid information should be the same //However all valid information should be the same
Sequence<Reference< xml::dom::XElement > > Sequence<Reference< xml::dom::XElement > >
infos(getUpdateInformation(updateInformation, urls, id, anyError)); infos(getUpdateInformation(updateInformation, urls, search_id, anyError));
if (anyError.hasValue()) if (anyError.hasValue())
out_errors.emplace_back(i->second.extension, anyError); out_errors.emplace_back(i->second.extension, anyError);
...@@ -110,15 +111,15 @@ void getOwnUpdateInfos( ...@@ -110,15 +111,15 @@ void getOwnUpdateInfos(
Reference< xml::dom::XNode >(infos[j], UNO_QUERY_THROW)); Reference< xml::dom::XNode >(infos[j], UNO_QUERY_THROW));
if (!infoset.hasDescription()) if (!infoset.hasDescription())
continue; continue;
boost::optional< OUString > id2(infoset.getIdentifier()); boost::optional< OUString > result_id(infoset.getIdentifier());
if (!id2) if (!result_id)
continue; continue;
OSL_ASSERT(*id2 == id); SAL_INFO( "extensions.update", " found version "
if (*id2 == id) << infoset.getVersion() << " for " << *result_id );
{ if (*result_id != search_id)
i->second.version = infoset.getVersion(); continue;
i->second.info.set(infos[j], UNO_QUERY_THROW); i->second.version = infoset.getVersion();
} i->second.info.set(infos[j], UNO_QUERY_THROW);
break; break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment