diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-07 22:08:54 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-07 22:08:54 +0000 |
| commit | 08248a9ad6625bce2f09ac92bcc11ab1d59d1534 (patch) | |
| tree | 1877f2c45ca29efae7993c8a356b969ebe8ae69e /chrome/installer | |
| parent | 5289774994713163d8a4bbfc7ba0823a686c8810 (diff) | |
| download | chromium_src-08248a9ad6625bce2f09ac92bcc11ab1d59d1534.zip chromium_src-08248a9ad6625bce2f09ac92bcc11ab1d59d1534.tar.gz chromium_src-08248a9ad6625bce2f09ac92bcc11ab1d59d1534.tar.bz2 | |
When COM DLL registration fails, return false from DoPostInstallTasks.
This was a regression from my refactoring change last week. Thanks for spotting this Greg.
TEST=This fixes a case where if registering a COM dll failed, we wouldn't roll back.
BUG=61609
Review URL: http://codereview.chromium.org/5511011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68521 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/setup/install.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc index 413e0d0..e6507d6 100644 --- a/chrome/installer/setup/install.cc +++ b/chrome/installer/setup/install.cc @@ -517,7 +517,10 @@ bool DoPostInstallTasks(const FilePath& setup_path, FindProduct(products, BrowserDistribution::CEEE)) { // TODO(robershield): move the "which DLLs should be registered" policy // into the installer. - RegisterComDlls(package, current_version, new_version); + if (!RegisterComDlls(package, current_version, new_version)) { + LOG(ERROR) << "RegisterComDlls failed. Aborting."; + return false; + } } // If we're told that we're an MSI install, make sure to set the marker |