Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9824)

Unified Diff: chrome/installer/setup/main.cc

Issue 268: Fix binary patching for localized OS. Not sure how it was working till now.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/bspatch/mbspatch.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/main.cc
===================================================================
--- chrome/installer/setup/main.cc (revision 1778)
+++ chrome/installer/setup/main.cc (working copy)
@@ -72,9 +72,9 @@
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 @@
<< "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;
}
}
« no previous file with comments | « no previous file | third_party/bspatch/mbspatch.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698