From c6c57cf372f458297b4ae1d83b7eac5f9248b74c Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Mon, 10 Nov 2008 08:33:44 +0000 Subject: [PATCH] Ask removal confirmation of conflicting packages before upgrading but not before if fetch-only operation finished. (#4539) --- pisi/operations/upgrade.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pisi/operations/upgrade.py b/pisi/operations/upgrade.py index 97830531..0099c553 100644 --- a/pisi/operations/upgrade.py +++ b/pisi/operations/upgrade.py @@ -129,9 +129,6 @@ def upgrade_pkg_names(A = []): if componentdb.has_component('system.base'): order = operations.helper.reorder_base_packages(order) - if not ctx.get_option('ignore_package_conflicts'): - conflicts = operations.helper.check_conflicts(order, packagedb) - ctx.ui.info(_('The following packages will be upgraded: ') + util.strlist(order)) @@ -159,6 +156,7 @@ def upgrade_pkg_names(A = []): return if not ctx.get_option('ignore_package_conflicts'): + conflicts = operations.helper.check_conflicts(order, packagedb) if conflicts: operations.remove.remove_conflicting_packages(conflicts)