summaryrefslogtreecommitdiff
path: root/fastboot/fastboot.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-06-02 21:37:05 -0700
committerElliott Hughes <enh@google.com>2015-06-03 11:01:41 -0700
commitacdbe92c60e662a4913f1fca09c2b8913791376c (patch)
tree3d24ffe6c6bbfd231ca200390e4f6b17040776f7 /fastboot/fastboot.cpp
parentf26eb51c2a85181d7093785760d2c90d6e9d4eeb (diff)
Don't say "update package missing" unless we mean it.
unzip_to_file reports failures itself these days, so there's it's unhelpful of the caller to just guess what might have gone wrong. Bug: http://b/21558406 Change-Id: I1e3d06c6cf902b8c6ef333dc60fd8f49680a493b
Diffstat (limited to 'fastboot/fastboot.cpp')
-rw-r--r--fastboot/fastboot.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 4e935e63b..5ad55d45f 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -732,12 +732,13 @@ void do_update(usb_handle *usb, const char *filename, int erase_first)
setup_requirements(reinterpret_cast<char*>(data), sz);
- for (size_t i = 0; i < ARRAY_SIZE(images); i++) {
+ for (size_t i = 0; i < ARRAY_SIZE(images); ++i) {
int fd = unzip_to_file(zip, images[i].img_name);
- if (fd < 0) {
- if (images[i].is_optional)
+ if (fd == -1) {
+ if (images[i].is_optional) {
continue;
- die("update package missing %s", images[i].img_name);
+ }
+ exit(1); // unzip_to_file already explained why.
}
fastboot_buffer buf;
int rc = load_buf_fd(usb, fd, &buf);