diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2016-08-19 17:37:29 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2016-08-29 18:20:03 +0300 |
| commit | 53c2aa8e382dd50d09b385285bc3fa0b645ace0a (patch) | |
| tree | 6d23d091bc57c0aa8d8a529e63ec2f2f22322a3a /bpkg/pkg-unpack.cxx | |
| parent | a4b29effed15b0a3e9309a4633a3ada37f3081e6 (diff) | |
Support system packages
Diffstat (limited to 'bpkg/pkg-unpack.cxx')
| -rw-r--r-- | bpkg/pkg-unpack.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
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; } |