aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-10 16:58:46 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-10 16:58:46 +0000
commitf10ecfcc4e8785d156599dc2e13dcd03fb6de368 (patch)
treee7810d6ebf1b00128250976bf9122cd4d584c362
parentd19535cfef9813af224ea90f269681ddbfdb1db1 (diff)
downloadpaludis-f10ecfcc4e8785d156599dc2e13dcd03fb6de368.tar.gz
paludis-f10ecfcc4e8785d156599dc2e13dcd03fb6de368.tar.xz
Show overridden masks on unmasked packages
Fixes: ticket:1081
-rw-r--r--src/clients/cave/cmd_show-fmt.hh4
-rw-r--r--src/clients/cave/cmd_show.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/clients/cave/cmd_show-fmt.hh b/src/clients/cave/cmd_show-fmt.hh
index f4ac487..7f273bc 100644
--- a/src/clients/cave/cmd_show-fmt.hh
+++ b/src/clients/cave/cmd_show-fmt.hh
@@ -96,8 +96,8 @@ const auto fs_package_heading = make_format_string_fetcher("show/package_heading
const auto fs_package_version_installed = make_format_string_fetcher("show/package_version_installed", 1)
<< c::bold_green_or_pink() << param<'s'>() << c::normal();
-const auto fs_package_version_installable = make_format_string_fetcher("show/package_version_installable", 1)
- << c::green_or_pink() << param<'s'>() << c::normal();
+const auto fs_package_version_installable = make_format_string_fetcher("show/package_version_installable", 2)
+ << c::green_or_pink() << param<'s'>() << param<'r'>() << c::normal();
const auto fs_package_version_unavailable = make_format_string_fetcher("show/package_version_unavailable", 1)
<< c::red() << "(" << param<'s'>() << ")" << param<'r'>() << c::normal();
diff --git a/src/clients/cave/cmd_show.cc b/src/clients/cave/cmd_show.cc
index fe838e9..e3e323b 100644
--- a/src/clients/cave/cmd_show.cc
+++ b/src/clients/cave/cmd_show.cc
@@ -1196,7 +1196,7 @@ namespace
rr = "(" + rr + ")";
if (! (*i)->masked())
- header_out << fuc(fs_package_version_installable(), fv<'s'>(stringify((*i)->canonical_form(idcf_version))));
+ header_out << fuc(fs_package_version_installable(), fv<'s'>(stringify((*i)->canonical_form(idcf_version))), fv<'r'>(rr));
else
{
std::string rs;