aboutsummaryrefslogtreecommitdiff
path: root/src/clients/cave/resolve_common.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-10-05 21:47:25 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-10-05 21:47:25 +0100
commit25a81a622c7e11ed7358d720eb2deb02e6b6328a (patch)
tree85d95d32363b5034c2156071d8594c3770f33c6e /src/clients/cave/resolve_common.cc
parent91545574ced81323755139e2b6b84bbb5cda0495 (diff)
downloadpaludis-25a81a622c7e11ed7358d720eb2deb02e6b6328a.tar.gz
paludis-25a81a622c7e11ed7358d720eb2deb02e6b6328a.tar.xz
cave resolve --ignore-{unable-decisions,unorderable-jobs}
Fixes: ticket:993
Diffstat (limited to 'src/clients/cave/resolve_common.cc')
-rw-r--r--src/clients/cave/resolve_common.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc
index 4dd3f5dcd..fc902c52d 100644
--- a/src/clients/cave/resolve_common.cc
+++ b/src/clients/cave/resolve_common.cc
@@ -983,14 +983,16 @@ paludis::cave::resolve_common(
graph_jobs_options, program_options, keys_if_import,
purge ? std::make_shared<const Sequence<std::pair<std::string, std::string> > >() : targets_if_not_purge);
- if (! resolver->resolved()->taken_unable_to_make_decisions()->empty())
- retcode |= 1;
+ if (! resolution_options.a_ignore_unable_decisions.specified())
+ if (! resolver->resolved()->taken_unable_to_make_decisions()->empty())
+ retcode |= 1;
if (! resolver->resolved()->taken_unconfirmed_decisions()->empty())
retcode |= 2;
- if (! resolver->resolved()->taken_unorderable_decisions()->empty())
- retcode |= 4;
+ if (! resolution_options.a_ignore_unorderable_jobs.specified())
+ if (! resolver->resolved()->taken_unorderable_decisions()->empty())
+ retcode |= 4;
if (0 == retcode)
return perform_resolution(env, resolver->resolved(), resolution_options,