From 53c2aa8e382dd50d09b385285bc3fa0b645ace0a Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 19 Aug 2016 17:37:29 +0300
Subject: Support system packages

---
 bpkg/pkg-unpack.cxx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'bpkg/pkg-unpack.cxx')

diff --git a/bpkg/pkg-unpack.cxx b/bpkg/pkg-unpack.cxx
index 4424017..84a4618 100644
--- a/bpkg/pkg-unpack.cxx
+++ b/bpkg/pkg-unpack.cxx
@@ -67,7 +67,9 @@ namespace bpkg
         diag_record dr (fail);
 
         dr << "package " << n << " already exists in configuration " << c <<
-          info << "version: " << p->version << ", state: " << p->state;
+          info << "version: " << p->version_string ()
+           << ", state: " << p->state
+           << ", substate: " << p->substate;
 
         if (s) // Suitable state for replace?
           dr << info << "use 'pkg-unpack --replace|-r' to replace";
@@ -95,6 +97,7 @@ namespace bpkg
         move (m.name),
         move (m.version),
         package_state::unpacked,
+        package_substate::none,
         false,   // hold package
         false,   // hold version
         repository_location (), // Root repository.
@@ -132,7 +135,7 @@ namespace bpkg
       fail << "package " << name << " is " << p->state <<
         info << "expected it to be fetched";
 
-    l4 ([&]{trace << p->name << " " << p->version;});
+    l4 ([&]{trace << *p;});
 
     assert (p->archive); // Should have archive in the fetched state.
 
@@ -258,7 +261,7 @@ namespace bpkg
     }
 
     if (verb)
-      text << "unpacked " << p->name << " " << p->version;
+      text << "unpacked " << *p;
 
     return 0;
   }
-- 
cgit v1.1