From 3a6c4ab1b6fc79a6a543088553cdd6bc8cb0a1dd Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 21 May 2018 21:10:09 +0300
Subject: Adapt to inventing package_name type

---
 bpkg/package.cxx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'bpkg/package.cxx')

diff --git a/bpkg/package.cxx b/bpkg/package.cxx
index 788935e..dea16f2 100644
--- a/bpkg/package.cxx
+++ b/bpkg/package.cxx
@@ -249,15 +249,17 @@ namespace bpkg
   }
 
   string
-  package_string (const string& n, const version& v, bool system)
+  package_string (const package_name& n, const version& v, bool system)
   {
+    assert (!n.empty ());
+
     string vs (v.empty ()
                ? string ()
                : v == wildcard_version
                  ? "/*"
                  : '/' + v.string ());
 
-    return system ? "sys:" + n + vs : n + vs;
+    return system ? "sys:" + n.string () + vs : n.string () + vs;
   }
 
   // selected_package
@@ -273,7 +275,7 @@ namespace bpkg
                      const dir_path& c,
                      transaction& t,
                      const dir_path& d,
-                     const string& n,
+                     const package_name& n,
                      const version& v,
                      bool check_external)
   {
-- 
cgit v1.1