Ask removal confirmation of conflicting packages before upgrading but not

before if fetch-only operation finished. (#4539)
2008-11-10 08:33:44 +00:00
parent d06e50b6f2
commit c6c57cf372
1 changed files with 1 additions and 3 deletions
@@ -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)