diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 18:14:03 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 18:14:03 +0000 |
| commit | e3c30dd8a152c17d6a63b048f0048ef9a76eed48 (patch) | |
| tree | 73f3da502a1475a8f2e0414360265913493ac016 /chrome/installer | |
| parent | 565328af78a242535ee0ffb4f3bbca7827382fb3 (diff) | |
| download | chromium_src-e3c30dd8a152c17d6a63b048f0048ef9a76eed48.zip chromium_src-e3c30dd8a152c17d6a63b048f0048ef9a76eed48.tar.gz chromium_src-e3c30dd8a152c17d6a63b048f0048ef9a76eed48.tar.bz2 | |
Revert 250500 "Add quotes around executable pathes in the mini i..."
Speculative revert to see if this resolves a spike in update failures on
canary.
> Add quotes around executable pathes in the mini installer
>
> BUG=340387
> TEST=N/A
>
> Review URL: https://codereview.chromium.org/154113004
TBR=cdn@chromium.org
Review URL: https://codereview.chromium.org/167333002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/mini_installer/mini_installer.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/installer/mini_installer/mini_installer.cc b/chrome/installer/mini_installer/mini_installer.cc index 89db18f..28a8057 100644 --- a/chrome/installer/mini_installer/mini_installer.cc +++ b/chrome/installer/mini_installer/mini_installer.cc @@ -402,12 +402,10 @@ bool UnpackBinaryResources(const Configuration& configuration, HMODULE module, // If we found setup 'B7' resource, handle it. if (setup_path->length() > 0) { CommandString cmd_line; - PathString exe_path; // Get the path to setup.exe first. bool success = true; - if (!GetSetupExePathFromRegistry(configuration, exe_path.get(), - exe_path.capacity()) || - !cmd_line.assign(exe_path.get()) || + if (!GetSetupExePathFromRegistry(configuration, cmd_line.get(), + cmd_line.capacity()) || !cmd_line.append(kCmdUpdateSetupExe) || !cmd_line.append(L"=\"") || !cmd_line.append(setup_path->get()) || @@ -427,7 +425,7 @@ bool UnpackBinaryResources(const Configuration& configuration, HMODULE module, int exit_code = 0; if (success && - (!RunProcessAndWait(exe_path.get(), cmd_line.get(), &exit_code) || + (!RunProcessAndWait(NULL, cmd_line.get(), &exit_code) || exit_code != ERROR_SUCCESS)) { success = false; } |