diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-12-10 16:20:42 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-12-16 15:10:47 +0100 |
| commit | 0b6884b9f1f60db48983de6c5bd53e25e1f68eeb (patch) | |
| tree | d8688db48e2e2bca83d9ac3cedf0e0c9169b0a27 /instsetoo_native | |
| parent | 7e7e203c26f0b22973aa65f163a8590d8313250d (diff) | |
tdf#121987 follow-up: never fail MSU install; warn instead.
This replaces commit 53058090beede6a399e2f408f62c28a2921ff8ab. Now
not only failure to start WU service, but also other errors during
MSU installation won't break installation. E.g., running WU service
as Guest does not prevent the service from starting; but installing
updates fail, which makes previous solution incomplete.
Instead, show a warning in those rare cases when an error happens,
and continue. It will allow users to see the reason if they see
"api-ms-win-*.dll missing" message later after installation. Of
course, some small percentage of these warnings will be false, e.g.
those on Windows 10. But those false messages must be really small
minority, because only when (1) the installation fails (2) on a
system with the component already present, such a message would be
false. And it will not prevent the installation.
This will not block unattended installations, since in those cases,
MsiProcessMessage() will do nothing.
Change-Id: I3a9e681e9d6701d092bd5c18bb4b68b4f77170f3
Reviewed-on: https://gerrit.libreoffice.org/64874
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf | 3 | ||||
| -rw-r--r-- | instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf index a14f45e0cd54..315e35fe0b33 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Error.ulf @@ -406,4 +406,7 @@ en-US = "This setup requires Internet Information Server 4.0 or higher for confi [OOO_ERROR_130] en-US = "This setup requires Administrator privileges for configuring IIS Virtual Roots." +[OOO_ERROR_131] +en-US = "Installing a pre-requisite KB2999226 failed. You might need to manually install it from Microsoft site to be able to run the product. [2]" + diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt index 2f3a5912817d..52cc797c643e 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Error.idt @@ -131,3 +131,4 @@ i2 L0 1932 OOO_ERROR_128 1933 OOO_ERROR_129 1934 OOO_ERROR_130 +25000 OOO_ERROR_131 |