aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2009-02-01 14:18:11 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2009-02-01 14:18:11 +0000
commitf98d139f05b78f0e775c279f755c098ac1341265 (patch)
tree69e4b549dc492583b0df79fd54c65226dd18defd
parent57c33cfa7fe6ca7ca2220bf8f40de8644a8d5f26 (diff)
downloadpaludis-f98d139f05b78f0e775c279f755c098ac1341265.tar.gz
paludis-f98d139f05b78f0e775c279f755c098ac1341265.tar.xz
Don't print silly messages if we're not messing with phases
-rw-r--r--paludis/install_task.cc15
1 files changed, 9 insertions, 6 deletions
diff --git a/paludis/install_task.cc b/paludis/install_task.cc
index 2f28792..3e42dc2 100644
--- a/paludis/install_task.cc
+++ b/paludis/install_task.cc
@@ -768,12 +768,15 @@ InstallTask::_one(const DepList::Iterator dep, const int x, const int y, const i
_imp->install_options.destination() = dep->destination();
bool apply_phases(false);
- if (is_first && _imp->phase_options_apply_to_first)
- apply_phases = true;
- if (is_last && _imp->phase_options_apply_to_last)
- apply_phases = true;
- if (_imp->phase_options_apply_to_all)
- apply_phases = true;
+ if (! _imp->abort_at_phases->empty() || ! _imp->skip_phases->empty() || ! _imp->skip_until_phases->empty())
+ {
+ if (is_first && _imp->phase_options_apply_to_first)
+ apply_phases = true;
+ if (is_last && _imp->phase_options_apply_to_last)
+ apply_phases = true;
+ if (_imp->phase_options_apply_to_all)
+ apply_phases = true;
+ }
if (apply_phases)
_imp->install_options.want_phase() = std::tr1::bind(&want_phase_function, this,
std::tr1::cref(_imp->abort_at_phases), std::tr1::cref(_imp->skip_phases), std::tr1::cref(_imp->skip_until_phases),