aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-06-04 21:13:54 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-06-04 21:13:54 +0000
commitd232ce8243d5a1a25cc2582041339ee030874b3e (patch)
tree4e2dbe41a01371d483fdb83a199d17d4ea1968c4
parentf0248cf27a85059adf2ecba5b0a28e2379a409d6 (diff)
downloadpaludis-d232ce8243d5a1a25cc2582041339ee030874b3e.tar.gz
paludis-d232ce8243d5a1a25cc2582041339ee030874b3e.tar.xz
r3226@snowflake: ciaranm | 2007-06-04 22:12:40 +0100
Fix || deps
-rw-r--r--paludis/dep_list/dep_list.cc6
-rw-r--r--paludis/dep_list/range_rewriter.hh3
2 files changed, 9 insertions, 0 deletions
diff --git a/paludis/dep_list/dep_list.cc b/paludis/dep_list/dep_list.cc
index 02a9dff..341c1bc 100644
--- a/paludis/dep_list/dep_list.cc
+++ b/paludis/dep_list/dep_list.cc
@@ -665,6 +665,7 @@ DepList::AddVisitor::visit_sequence(const AnyDepSpec &,
std::for_each(cur, end, accept_visitor(r));
if (r.spec())
{
+ Context context("When using rewritten range '" + stringify(*r.spec()) + "':");
TreeLeaf<DependencySpecTree, PackageDepSpec> rr(r.spec());
d->add_not_top_level(rr, destinations);
return;
@@ -679,6 +680,7 @@ DepList::AddVisitor::visit_sequence(const AnyDepSpec &,
if (d->already_installed(*c, destinations))
{
+ Context context("When using already installed group to resolve dependencies:");
d->add_not_top_level(*c, destinations);
return;
}
@@ -695,6 +697,8 @@ DepList::AddVisitor::visit_sequence(const AnyDepSpec &,
try
{
+ Context context("When using already installed package to resolve dependencies:");
+
Save<bool> save_t(&d->_imp->throw_on_blocker,
dl_blocks_discard_completely != d->_imp->opts->blocks);
Save<DepListOverrideMasks> save_o(&d->_imp->opts->override_masks, DepListOverrideMasks());
@@ -714,6 +718,8 @@ DepList::AddVisitor::visit_sequence(const AnyDepSpec &,
try
{
+ Context context("When using new group to resolve dependencies:");
+
Save<bool> save_t(&d->_imp->throw_on_blocker,
dl_blocks_discard_completely != d->_imp->opts->blocks);
Save<DepListOverrideMasks> save_o(&d->_imp->opts->override_masks, DepListOverrideMasks());
diff --git a/paludis/dep_list/range_rewriter.hh b/paludis/dep_list/range_rewriter.hh
index ad84346..96f6352 100644
--- a/paludis/dep_list/range_rewriter.hh
+++ b/paludis/dep_list/range_rewriter.hh
@@ -54,6 +54,9 @@ namespace paludis
*/
tr1::shared_ptr<PackageDepSpec> spec() const
{
+ if (_invalid)
+ return tr1::shared_ptr<PackageDepSpec>();
+
return _spec;
}