openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am ac462d93: Merge "Don\'t say "update package missing" unless we mean it." 

* commit 'ac462d93337e6ca5c29d3527abb95e363347cf78':
  Don't say "update package missing" unless we mean it.
This commit is contained in:
Elliott Hughes 2015-06-03 18:10:56 +00:00 committed by Android Git Automerger
parent ce05367734 ac462d9333
commit de28adf394
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fastboot/fastboot.cpp
View File

@ -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);