Merge "Fix fastboot to not add '-' before suffix"

This commit is contained in:
Daniel Rosenberg 2015-11-13 21:24:39 +00:00 committed by Gerrit Code Review
commit ce24abe261

View file

@ -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]) {