From 04be15a91d1d0c4e6039ef5186ef536188f114bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eray=20=C3=96zkural?= Date: Tue, 23 May 2006 11:03:00 +0000 Subject: [PATCH] * fix: make it possible to bypass safety switch by returning empty set in upgrade_base function and removing cruft left from an early revision --- pisi/operations.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pisi/operations.py b/pisi/operations.py index 8b33a7da..4fe90da0 100644 --- a/pisi/operations.py +++ b/pisi/operations.py @@ -271,8 +271,9 @@ def upgrade_base(A = set()): return set(install_order + extra_upgrades) else: ctx.ui.warning(_('Safety switch: the component system.base cannot be found')) + return set() -def install_pkg_names(A, reinstall = False, bypass_safety = False): +def install_pkg_names(A, reinstall = False): """This is the real thing. It installs packages from the repository, trying to perform a minimum number of installs""" @@ -295,8 +296,7 @@ def install_pkg_names(A, reinstall = False, bypass_safety = False): ctx.ui.info(_('No packages to install.')) return - if not bypass_safety: - A |= upgrade_base(A) + A |= upgrade_base(A) if not ctx.config.get_option('ignore_dependency'): G_f, order = plan_install_pkg_names(A) @@ -363,7 +363,7 @@ def plan_install_pkg_names(A): def upgrade(A): upgrade_pkg_names(A) -def upgrade_pkg_names(A = [], bypass_safety = False): +def upgrade_pkg_names(A = []): """Re-installs packages from the repository, trying to perform a minimum or maximum number of upgrades according to options.""" @@ -408,8 +408,7 @@ def upgrade_pkg_names(A = [], bypass_safety = False): ctx.ui.info(_('No packages to upgrade.')) return True - if not bypass_safety: - A |= upgrade_base(A) + A |= upgrade_base(A) ctx.ui.debug('A = %s' % str(A))