From 53c2aa8e382dd50d09b385285bc3fa0b645ace0a Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Fri, 19 Aug 2016 17:37:29 +0300 Subject: Support system packages --- bpkg/pkg-command.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'bpkg/pkg-command.cxx') diff --git a/bpkg/pkg-command.cxx b/bpkg/pkg-command.cxx index ba1b548..469e3a0 100644 --- a/bpkg/pkg-command.cxx +++ b/bpkg/pkg-command.cxx @@ -124,7 +124,10 @@ namespace bpkg fail << "package " << n << " is " << p->state << info << "expected it to be configured"; - l4 ([&]{trace << p->name << " " << p->version;}); + if (p->substate == package_substate::system) + fail << "cannot " << cmd << " system package " << n; + + l4 ([&]{trace << *p;}); // Read package-specific variables. // @@ -142,8 +145,7 @@ namespace bpkg if (verb) { for (const pkg_command_vars& pv: ps) - text << cmd << (cmd.back () != 'e' ? "ed " : "d ") - << pv.pkg->name << " " << pv.pkg->version; + text << cmd << (cmd.back () != 'e' ? "ed " : "d ") << *pv.pkg; } return 0; -- cgit v1.1