aboutsummaryrefslogtreecommitdiff
path: root/src/output/mask_displayer.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/output/mask_displayer.cc')
-rw-r--r--src/output/mask_displayer.cc18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/output/mask_displayer.cc b/src/output/mask_displayer.cc
index 3b0a68315..765232dc8 100644
--- a/src/output/mask_displayer.cc
+++ b/src/output/mask_displayer.cc
@@ -29,6 +29,8 @@
#include <paludis/util/timestamp.hh>
#include <paludis/name.hh>
#include <paludis/metadata_key.hh>
+#include <paludis/package_id.hh>
+#include <paludis/dep_spec.hh>
#include <sstream>
using namespace paludis;
@@ -241,10 +243,10 @@ MaskDisplayer::visit(const UnacceptedMask & m)
if (_imp->want_description)
_imp->s << m.description() << " (";
- if (m.unaccepted_key())
+ if (! m.unaccepted_key_name().empty())
{
KeyPrettyPrinter k(_imp->env, _imp->id);
- m.unaccepted_key()->accept(k);
+ (*_imp->id->find_metadata(m.unaccepted_key_name()))->accept(k);
_imp->s << k.s.str();
}
@@ -265,19 +267,19 @@ MaskDisplayer::visit(const RepositoryMask & m)
{
_imp->s << m.description();
- if (m.mask_key())
+ if (! m.mask_key_name().empty())
{
KeyPrettyPrinter k(_imp->env, _imp->id);
- m.mask_key()->accept(k);
+ (*_imp->id->find_metadata(m.mask_key_name()))->accept(k);
_imp->s << " (" << k.s.str() << ")";
}
}
else
{
- if (m.mask_key())
+ if (! m.mask_key_name().empty())
{
KeyPrettyPrinter k(_imp->env, _imp->id);
- m.mask_key()->accept(k);
+ (*_imp->id->find_metadata(m.mask_key_name()))->accept(k);
_imp->s << k.s.str();
}
else
@@ -298,8 +300,8 @@ void
MaskDisplayer::visit(const AssociationMask & m)
{
if (_imp->want_description)
- _imp->s << m.description() << " (associated package '" << *m.associated_package() << "')";
+ _imp->s << m.description() << " (associated package '" << m.associated_package_spec() << "')";
else
- _imp->s << *m.associated_package();
+ _imp->s << m.associated_package_spec();
}