Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 966339b2 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

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
(cherry picked from commit acdbe92c)
parent c688c232

fastboot/fastboot.cpp

+5 −4
Original line number Diff line number Diff line
@@ -724,13 +724,14 @@ 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;

            }

            CloseArchive(zip);

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