aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-28 05:49:44 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-28 05:49:44 +0000
commit3f79cf7672ee122fc7c1b7f481a1d87c808b55d9 (patch)
tree1fde930efa3a34d0d050b69b5e8d5798572d4cf5
parent22500f7b5968039da2f139f6521ad507bd25adf0 (diff)
downloadpaludis-3f79cf7672ee122fc7c1b7f481a1d87c808b55d9.tar.gz
paludis-3f79cf7672ee122fc7c1b7f481a1d87c808b55d9.tar.xz
r1206@snowdrop: ciaranm | 2006-07-28 04:03:25 +0100
Don't update world for set targets. Fixes: Berlios#8219.
-rw-r--r--paludis/tasks/install_task.cc17
1 files changed, 10 insertions, 7 deletions
diff --git a/paludis/tasks/install_task.cc b/paludis/tasks/install_task.cc
index 26cff7e..9c7b49b 100644
--- a/paludis/tasks/install_task.cc
+++ b/paludis/tasks/install_task.cc
@@ -374,15 +374,18 @@ InstallTask::execute()
}
/* update world */
- if (! _imp->preserve_world)
+ if (! _imp->had_set_targets)
{
- on_update_world_pre();
- WorldCallbacks w(this);
- _imp->env->add_appropriate_to_world(_imp->targets, &w);
- on_update_world_post();
+ if (! _imp->preserve_world)
+ {
+ on_update_world_pre();
+ WorldCallbacks w(this);
+ _imp->env->add_appropriate_to_world(_imp->targets, &w);
+ on_update_world_post();
+ }
+ else
+ on_preserve_world();
}
- else
- on_preserve_world();
/* we've fetched / installed the entire list */
if (_imp->install_options.get<io_fetchonly>())