From e9bf4dd1604353077916eda319edb929a1ee91da Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 27 Oct 2006 21:25:41 +0000 Subject: [PATCH] * generate_base_upgrade needs it --- pisi/api.py | 2 +- pisi/operations.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pisi/api.py b/pisi/api.py index d7a7d63f..b850c94e 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -216,7 +216,7 @@ def generate_base_upgrade(A): # all the packages of the system.base must be installed on the system. # method returns the currently needed system.base component install and # upgrade needs - base = upgrade_base(A) + base = upgrade_base(A, ignore_package_conflicts = True) return list(base) def configure_pending(): diff --git a/pisi/operations.py b/pisi/operations.py index 18ffab88..a49350e9 100644 --- a/pisi/operations.py +++ b/pisi/operations.py @@ -283,7 +283,7 @@ def is_upgradable(name, ignore_build = False): else: return build < pkg.build -def upgrade_base(A = set()): +def upgrade_base(A = set(), ignore_package_conflicts = False): ignore_build = ctx.get_option('ignore_build_no') if not ctx.get_option('ignore_safety'): if ctx.componentdb.has_component('system.base'): @@ -292,7 +292,7 @@ def upgrade_base(A = set()): if extra_installs: ctx.ui.warning(_('Safety switch: Following packages in system.base will be installed: ') + util.strlist(extra_installs)) - G_f, install_order = plan_install_pkg_names(extra_installs) + G_f, install_order = plan_install_pkg_names(extra_installs, ignore_package_conflicts) extra_upgrades = filter(lambda x: is_upgradable(x, ignore_build), systembase - set(install_order)) upgrade_order = [] if extra_upgrades: