ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: ce24abe261

* commit 'ce24abe261cbc9696c7ef61818153b99943d026e':
  Fix fastboot to not add '-' before suffix
This commit is contained in:
Daniel Rosenberg 2015-11-13 21:29:27 +00:00 • committed by android-build-merger
commit ec7fa7b479
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fastboot/fastboot.cpp
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]) {