commit f5c0b9cfe82a93968ebdc798f6f42e3aacb9d021
author Chris Sosa <sosa@chromium.org> Thu Apr 17 16:12:03 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Apr 18 03:07:14 2014 +0000
tree b5d2572eee1c9280b2733251c4ea827a0fc45e80
parent 41a75a7ca3f0252f2c9f991dd465aa332e7ce4d1

Exit with 1 if can_rollback returns UNAVAILABLE.

BUG=chromium:356898
TEST=update_engine_client -can_rollback

Change-Id: I1c357f5543abe83f00bb386f3e0226a97c4f44a3
Reviewed-on: https://chromium-review.googlesource.com/195459
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>
Commit-Queue: Chris Sosa <sosa@chromium.org>

update_engine_client.cc

diff --git a/update_engine_client.cc b/update_engine_client.cc
index 41c53ee..7406b65 100644
--- a/update_engine_client.cc
+++ b/update_engine_client.cc
@@ -587,12 +587,18 @@
   // Show the rollback availability.
   if (FLAGS_can_rollback) {
     std::string rollback_partition = GetRollbackPartition();
-    if (rollback_partition.empty())
+    bool can_rollback = true;
+    if (rollback_partition.empty()) {
       rollback_partition = "UNAVAILABLE";
+      can_rollback = false;
+    }
     else
       rollback_partition = "AVAILABLE: " + rollback_partition;
 
     LOG(INFO) << "Rollback partition: " << rollback_partition;
+    if (!can_rollback) {
+      return 1;
+    }
   }
 
   // Show the current P2P enabled setting.