Merge branch 'dev/roschuma/fs-testing'

1 files changed, 14 insertions, 20 deletions

diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/BinaryParagraph.cpp
index 499ef54f7..99d7d230b 100644
--- a/toolsrc/src/BinaryParagraph.cpp
+++ b/toolsrc/src/BinaryParagraph.cpp
@@ -68,29 +68,23 @@ namespace vcpkg
         return Strings::format("%s_%s_%s", this->spec.name(), this->version, this->spec.triplet());
     }
 
-    std::ostream& operator<<(std::ostream& os, const BinaryParagraph& p)
+    void serialize(const BinaryParagraph& pgh, std::string& out_str)
     {
-        os << "Package: " << p.spec.name() << "\n";
-        os << "Version: " << p.version << "\n";
-        if (!p.depends.empty())
+        out_str.append("Package: ").append(pgh.spec.name()).push_back('\n');
+        out_str.append("Version: ").append(pgh.version).push_back('\n');
+        if (!pgh.depends.empty())
         {
-            os << "Depends: " << p.depends.front();
+            out_str.append("Depends: ");
+            out_str.append(Strings::join(", ", pgh.depends));
+            out_str.push_back('\n');
+        }
 
-            auto b = p.depends.begin() + 1;
-            auto e = p.depends.end();
-            for (; b != e; ++b)
-            {
-                os << ", " << *b;
-            }
+        out_str.append("Architecture: ").append(pgh.spec.triplet().to_string()).push_back('\n');
+        out_str.append("Multi-Arch: same\n");
 
-            os << "\n";
-        }
-        os << "Architecture: " << p.spec.triplet().to_string() << "\n";
-        os << "Multi-Arch: same\n";
-        if (!p.maintainer.empty())
-            os << "Maintainer: " << p.maintainer << "\n";
-        if (!p.description.empty())
-            os << "Description: " << p.description << "\n";
-        return os;
+        if (!pgh.maintainer.empty())
+            out_str.append("Maintainer: ").append(pgh.maintainer).push_back('\n');
+        if (!pgh.description.empty())
+            out_str.append("Description: ").append(pgh.description).push_back('\n');
     }
 }