commit 425aa9764d6eac48cf06f726a30422d4e184c3d1
author Allie Wood <alliewood@chromium.org> Tue Feb 17 14:47:17 2015 -0800
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Wed Feb 18 23:53:16 2015 +0000
tree 575137e04e6ae0f96a796de45a2e9a411bb995fb
parent 78750a450ce84b2d335134402d041aa8773ab8ef

update_engine: Changes to delta minor version detection

Delta minor version should default to 1, the in-place algorithm minor
version, when the minor version is not given on the command line or in
the update_engine.conf file.

BUG=chromium:455493
TEST=`FEATURES=test emerge-link update_engine`

Change-Id: I510a19c4a3b88bae656c19ad1a6d24598586b6a9
Reviewed-on: https://chromium-review.googlesource.com/250560
Reviewed-by: Alex Deymo <deymo@chromium.org>
Tested-by: Allie Wood <alliewood@chromium.org>
Commit-Queue: Allie Wood <alliewood@chromium.org>

payload_generator/generate_delta_main.cc

diff --git a/payload_generator/generate_delta_main.cc b/payload_generator/generate_delta_main.cc
index 4832430..3fb6654 100644
--- a/payload_generator/generate_delta_main.cc
+++ b/payload_generator/generate_delta_main.cc
@@ -390,7 +390,7 @@
       FLAGS_minor_version = minor_version;
     } else {
       if (is_delta) {
-        FLAGS_minor_version = DeltaPerformer::kSupportedMinorPayloadVersion;
+        FLAGS_minor_version = kInPlaceMinorPayloadVersion;
       } else {
         FLAGS_minor_version = DeltaPerformer::kFullPayloadMinorVersion;
       }

utils.cc

diff --git a/utils.cc b/utils.cc
index c512414..1f57672 100644
--- a/utils.cc
+++ b/utils.cc
@@ -1580,7 +1580,10 @@
   std::string result;
   if (base::PathExists(path) && store.Load(path) &&
       store.GetString("PAYLOAD_MINOR_VERSION", &result)) {
-    *minor_version = atoi(result.c_str());
+    if (!base::StringToUint(result, minor_version)) {
+      LOG(ERROR) << "StringToUint failed when parsing delta minor version.";
+      return false;
+    }
     return true;
   }
   return false;