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

am: ec7fa7b479

* commit 'ec7fa7b479453c6fd55cf794c16202f1c78a91d9':
  Fix fastboot to not add '-' before suffix
This commit is contained in:
Daniel Rosenberg 2015-11-13 21:33:40 +00:00 committed by android-build-merger
commit b955d952ca

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)) {
die("Failed to identify current slot.\n");
}
func(std::string(part) + '-' + current_slot);
func(std::string(part) + current_slot);
} else {
func(std::string(part) + '-' + slot);
func(std::string(part) + slot);
}
} else {
if (force_slot && slot && slot[0]) {