Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ask removal confirmation of conflicting packages before upgrading but not

Browse Source 
before if fetch-only operation finished. (#4539)
This commit is contained in:
Faik Uygur
2008-11-10 08:33:44 +00:00
parent d06e50b6f2
commit c6c57cf372
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/operations/upgrade.py
+1 -3
View File
@@ -129,9 +129,6 @@ def upgrade_pkg_names(A = []):
if componentdb.has_component('system.base'): if componentdb.has_component('system.base'):
order = operations.helper.reorder_base_packages(order) 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: ') + ctx.ui.info(_('The following packages will be upgraded: ') +
util.strlist(order)) util.strlist(order))
@@ -159,6 +156,7 @@ def upgrade_pkg_names(A = []):
return return
if not ctx.get_option('ignore_package_conflicts'): if not ctx.get_option('ignore_package_conflicts'):
conflicts = operations.helper.check_conflicts(order, packagedb)
if conflicts: if conflicts:
operations.remove.remove_conflicting_packages(conflicts) operations.remove.remove_conflicting_packages(conflicts)