diff options
| author | Tao Bao <tbao@google.com> | 2015-05-19 17:02:16 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-07 19:02:26 -0800 |
| commit | 60ae120f7d94c6b3c526c9dd7e7e638ad5d9b6f6 (patch) | |
| tree | 0fcee8cce3db987a0baaf2c6c091a7714d0fc53e /install.cpp | |
| parent | 45c6451216ea62837006977ca38612c84c57e839 (diff) | |
| download | bootable_recovery-60ae120f7d94c6b3c526c9dd7e7e638ad5d9b6f6.zip bootable_recovery-60ae120f7d94c6b3c526c9dd7e7e638ad5d9b6f6.tar.gz bootable_recovery-60ae120f7d94c6b3c526c9dd7e7e638ad5d9b6f6.tar.bz2 | |
Log update outputs in order
Although stdout and stderr are both redirected to log file with no
buffering, we are seeing some outputs are mixed in random order.
This is because ui_print commands from the updater are passed to the
recovery binary via a pipe, which may interleave with other outputs
that go to stderr directly.
In recovery, adding ui::PrintOnScreenOnly() function to handle
ui_print command, which skips printing to stdout. Meanwhile, updater
prints the contents to stderr in addition to piping them to recovery.
Change-Id: Idda93ea940d2e23a0276bb8ead4aa70a3cb97700
Diffstat (limited to 'install.cpp')
| -rw-r--r-- | install.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/install.cpp b/install.cpp index be97987..8f2f252 100644 --- a/install.cpp +++ b/install.cpp @@ -165,9 +165,9 @@ try_update_binary(const char* path, ZipArchive* zip, bool* wipe_cache) { } else if (strcmp(command, "ui_print") == 0) { char* str = strtok(NULL, "\n"); if (str) { - ui->Print("%s", str); + ui->PrintOnScreenOnly("%s", str); } else { - ui->Print("\n"); + ui->PrintOnScreenOnly("\n"); } fflush(stdout); } else if (strcmp(command, "wipe_cache") == 0) { |