aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-09-01 18:30:35 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-09-01 18:54:32 +0100
commit81f3d51a3b47c20ec3b4fbee582b48660ce2e9ed (patch)
tree86ee9c7ed2b1314cb613d11be3265ed75fad2fe9
parent243ba0181d0c63af58317d56ff6e351076e76c1d (diff)
downloadpaludis-81f3d51a3b47c20ec3b4fbee582b48660ce2e9ed.tar.gz
paludis-81f3d51a3b47c20ec3b4fbee582b48660ce2e9ed.tar.xz
Don't stringify block specs by ! + blocked spec
-rw-r--r--paludis/dep_list.cc5
-rw-r--r--paludis/dep_tag.cc2
-rw-r--r--paludis/repositories/e/qa/spec_keys.cc4
3 files changed, 5 insertions, 6 deletions
diff --git a/paludis/dep_list.cc b/paludis/dep_list.cc
index e5a734a..320eb97 100644
--- a/paludis/dep_list.cc
+++ b/paludis/dep_list.cc
@@ -815,7 +815,7 @@ DepList::AddVisitor::visit_leaf(const BlockDepSpec & a)
// TODO: check destinations
- Context context("When checking BlockDepSpec '!" + stringify(*a.blocked_spec()) + "':");
+ Context context("When checking BlockDepSpec '" + stringify(a) + "':");
Save<std::tr1::shared_ptr<ConstTreeSequence<DependencySpecTree, AllDepSpec> > > save_c(
&conditions, d->_imp->opts->dependency_tags ? ConditionTracker(conditions).add_condition(a) : conditions);
@@ -904,8 +904,7 @@ DepList::AddVisitor::visit_leaf(const BlockDepSpec & a)
throw BlockError(stringify(*a.blocked_spec()));
case dl_blocks_discard:
- Log::get_instance()->message("dep_list.discarding_block", ll_warning, lc_context) << "Discarding block '!"
- << *a.blocked_spec() << "'";
+ Log::get_instance()->message("dep_list.discarding_block", ll_warning, lc_context) << "Discarding block '" << a << "'";
break;
case dl_blocks_discard_completely:
diff --git a/paludis/dep_tag.cc b/paludis/dep_tag.cc
index 6923c20..4a0085a 100644
--- a/paludis/dep_tag.cc
+++ b/paludis/dep_tag.cc
@@ -197,7 +197,7 @@ namespace
void
visit_leaf(const BlockDepSpec & b)
{
- s << "!" << *b.blocked_spec() << " ";
+ s << b << " ";
}
void
diff --git a/paludis/repositories/e/qa/spec_keys.cc b/paludis/repositories/e/qa/spec_keys.cc
index a7808e8..696e0f7 100644
--- a/paludis/repositories/e/qa/spec_keys.cc
+++ b/paludis/repositories/e/qa/spec_keys.cc
@@ -138,8 +138,8 @@ namespace
void visit_leaf(const BlockDepSpec & b)
{
if (child_of_any)
- reporter.message(QAMessage(entry, qaml_normal, name, "'|| ( )' with block child '!"
- + stringify(*b.blocked_spec()) + "' in '" + stringify(key->raw_name()) + "'")
+ reporter.message(QAMessage(entry, qaml_normal, name, "'|| ( )' with block child '"
+ + stringify(b) + "' in '" + stringify(key->raw_name()) + "'")
.with_associated_id(id)
.with_associated_key(id, key));
}