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

Commit fb2f06fb authored by Daniel Rosenberg's avatar Daniel Rosenberg Committed by android-build-merger
Browse files

Merge "Fix fastboot to not add \'-\' before suffix" am: ce24abe2 am: ec7fa7b4 

am: b955d952

* commit 'b955d952':
  Fix fastboot to not add '-' before suffix
parents 28f23889 b955d952

fastboot/fastboot.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -751,9 +751,9 @@ static void do_for_partition(usb_handle* usb, const char *part, const char *slot 
            if (!fb_getvar(usb, "current-slot", &current_slot)) {

            if (!fb_getvar(usb, "current-slot", &current_slot)) {

                die("Failed to identify current slot.\n");

                die("Failed to identify current slot.\n");

            }

            }

            func(std::string(part) + '-' + current_slot);

            func(std::string(part) + current_slot);

        } else {

        } else {

            func(std::string(part) + '-' + slot);

            func(std::string(part) + slot);

        }

        }

    } else {

    } else {

        if (force_slot && slot && slot[0]) {

        if (force_slot && slot && slot[0]) {