From 9139e842a8886809c84bbcf58fd15947c572999b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Wed, 28 Jun 2006 12:00:44 +0000 Subject: [PATCH] really fix emerge... --- pisi/operations.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pisi/operations.py b/pisi/operations.py index b11dd27e..56ab3d56 100644 --- a/pisi/operations.py +++ b/pisi/operations.py @@ -701,6 +701,8 @@ def emerge(A, rebuild_all = False): #A |= upgrade_base(A) + # FIXME: Errr... order_build changes type conditionally and this + # is not good. - baris if not ctx.config.get_option('ignore_dependency'): G_f, order_inst, order_build = plan_emerge(A, rebuild_all) else: @@ -733,10 +735,14 @@ installed in the respective order to satisfy dependencies: #ctx.ui.notify(ui.packagestogo, order = order_build) for x in order_build: - package_names, blah = atomicoperations.build(x) + package_names = atomicoperations.build(x)[0] install_pkg_files(package_names) # handle inter-package deps here - if 'pisi' in order_build or ( ('pisi' in order_build.union(order_inst)) and pisi_installed): + # FIXME: take a look at the fixme above :(, we have to be sure + # that order_build is a known type... + U = set(order_build) + U.update(order_inst) + if 'pisi' in order_build or (('pisi' in U) and pisi_installed): upgrade_pisi() def plan_emerge(A, rebuild_all):