aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-01-02 21:42:47 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-01-02 21:42:47 +0000
commita2575129fc52087019a784c484e770e70aa41987 (patch)
treeed82be5b99a6737b8a74b961a0ee61f3031bd4cd
parent75c527e42774991f2a8962afd85fbd2a1ffb1e77 (diff)
downloadpaludis-a2575129fc52087019a784c484e770e70aa41987.tar.gz
paludis-a2575129fc52087019a784c484e770e70aa41987.tar.xz
Don't exec when there're only skip packages later on the list
-rw-r--r--paludis/tasks/install_task.cc16
1 files changed, 14 insertions, 2 deletions
diff --git a/paludis/tasks/install_task.cc b/paludis/tasks/install_task.cc
index d9aeac6..a8322f6 100644
--- a/paludis/tasks/install_task.cc
+++ b/paludis/tasks/install_task.cc
@@ -355,8 +355,20 @@ InstallTask::execute()
}
/* if we installed paludis and a re-exec is available, use it. */
- if (dep->package.name == QualifiedPackageName("sys-apps/paludis") && (next(dep) != dep_end))
- on_installed_paludis();
+ if (dep->package.name == QualifiedPackageName("sys-apps/paludis"))
+ {
+ DepList::Iterator d(dep);
+ do
+ {
+ ++d;
+ if (d == dep_end)
+ break;
+ }
+ while (d->skip_install);
+
+ if (d != dep_end)
+ on_installed_paludis();
+ }
}
/* update world */