commit 8c9237e2f9207a4a71728087c4884ecd9a8ec6e4
author Daniel Rosenberg <drosen@google.com> Fri Nov 13 12:51:23 2015 -0800
committer Rom Lemarchand <romlem@google.com> Mon Nov 16 12:48:58 2015 -0800
tree bf76c29a8ad6f28b8d89a8c528b9dbf33a4be575
parent 156304c2b92d0cd83f98984adc1cb543292a0ed1

Fix fastboot to not add '-' before suffix

Change-Id: I9351b385412151498f47ab46a2620f21b9ac38b8

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 42e47a6..e456391 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -751,9 +751,9 @@
             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]) {