commit d402e7dfe02e5097d1e7e62346953db3808b18cc
author Felipe Leme <felipeal@google.com> Wed Aug 03 09:22:27 2016 -0700
committer Felipe Leme <felipeal@google.com> Wed Aug 03 15:33:51 2016 -0700
tree 86213fe0ea091069827e4ff5438eb5717d4774ce
parent ba8e8271d142acdc345d509b1745f54eba5a847e

Refactored use of ON_DRY_RUN macros.

BUG: 26379932
Change-Id: Ie032d468540da3c4ac0df1ea2d88a0aac4c722a7

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 52c6e56..d005d59 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -296,7 +296,10 @@
     printf("------ %s (%s) ------\n", title.c_str(), args_string.c_str());
     fflush(stdout);
 
-    ON_DRY_RUN({ update_progress(timeout_seconds); return; });
+    if (is_dry_run()) {
+        update_progress(timeout_seconds);
+        return;
+    }
 
     run_command_always(title.c_str(), root_mode, NORMAL_STDOUT, timeout_seconds, dumpsys_args);
 }