diff options
| author | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-08 17:40:14 +0000 |
|---|---|---|
| committer | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-08 17:40:14 +0000 |
| commit | 584fa1d4f6bcc7e0c769e0dbfa36f819a93f3ec2 (patch) | |
| tree | f4f30864356f5f32caa4fe5f1caf5d5174f5a4ce /chrome/installer | |
| parent | bc440904b0a365ee6cad952086662e5cdd60a5c1 (diff) | |
| download | chromium_src-584fa1d4f6bcc7e0c769e0dbfa36f819a93f3ec2.zip chromium_src-584fa1d4f6bcc7e0c769e0dbfa36f819a93f3ec2.tar.gz chromium_src-584fa1d4f6bcc7e0c769e0dbfa36f819a93f3ec2.tar.bz2 | |
Fix binary patching for localized OS. Not sure how it was working till now.
BUG=1557
Review URL: http://codereview.chromium.org/268
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/setup/main.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/installer/setup/main.cc b/chrome/installer/setup/main.cc index 7d10579..1925e22 100644 --- a/chrome/installer/setup/main.cc +++ b/chrome/installer/setup/main.cc @@ -72,9 +72,9 @@ int PatchArchiveFile(bool system_install, const std::wstring& archive_path, LOG(INFO) << "Applying patch " << patch_archive << " to file " << existing_archive << " and generating file " << uncompressed_archive; - return ApplyBinaryPatch(WideToUTF8(existing_archive).c_str(), - WideToUTF8(patch_archive).c_str(), - WideToUTF8(uncompressed_archive).c_str()); + return ApplyBinaryPatch(existing_archive.c_str(), + patch_archive.c_str(), + uncompressed_archive.c_str()); } @@ -126,9 +126,9 @@ DWORD UnPackArchive(const std::wstring& archive, bool system_install, << "installed on the system."; return 1; } - if (PatchArchiveFile(system_install, temp_path, uncompressed_archive, - installed_version)) { - LOG(ERROR) << "Binary patching failed."; + if (int i = PatchArchiveFile(system_install, temp_path, + uncompressed_archive, installed_version)) { + LOG(ERROR) << "Binary patching failed with error " << i; return 1; } } |