commit 06e4696e89c1a60ecf1d1209a809c59e5c0fc8e7
author Daniel Rosenberg <drosen@google.com> Fri Nov 13 21:29:27 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 13 21:29:27 2015 +0000
tree 2697db5db69369a49632365045cc8a0bb36a4325
parent 8e62002232e3983a3b11ce58dcc97d9a6a6f42e6
parent a7009f1fbbf5ab2c82b7ce5817ff0540babb5e01

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

* commit 'ce24abe261cbc9696c7ef61818153b99943d026e':
  Fix fastboot to not add '-' before suffix

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 3ab8f94..9f72c83 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]) {