commit ac791e6557979ac336ba838be30b89c2d591185a
author Ryan Mitchell <rtmitchell@google.com> Wed Apr 03 11:02:39 2019 -0700
committer Ryan Mitchell <rtmitchell@google.com> Wed Apr 03 11:02:39 2019 -0700
tree cc9a49b35175b690839fdc57db67f6440f5f3fb3
parent 0d609de62d808f9abf789805caf72a45d942fccf

Fix idmap2 policy concatenation

When printing warning messages while generating idmaps, put the vertical
bar chracater in between the policies.

Bug: none
Test: manual

Change-Id: I8efee753d9ed7ce99ccafd49b6c8744eea031839

cmds/idmap2/libidmap2/Idmap.cpp

diff --git a/cmds/idmap2/libidmap2/Idmap.cpp b/cmds/idmap2/libidmap2/Idmap.cpp
index 6d5fe7b..49470b4 100644
--- a/cmds/idmap2/libidmap2/Idmap.cpp
+++ b/cmds/idmap2/libidmap2/Idmap.cpp
@@ -269,12 +269,10 @@
 std::string ConcatPolicies(const std::vector<std::string>& policies) {
   std::string message;
   for (const std::string& policy : policies) {
-    if (message.empty()) {
-      message.append(policy);
-    } else {
-      message.append(policy);
+    if (!message.empty()) {
       message.append("|");
     }
+    message.append(policy);
   }
 
   return message;