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

revert :(

Browse Source 
in pisi up A B C aSystemBasePackage scenario

aSystemBasePackage does not end in systembase_order list

plan B
This commit is contained in:
Faik Uygur
2006-11-26 20:36:12 +00:00
parent 1abb142583
commit a511b2c241
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/api.py
+1 -1
View File
@@ -222,7 +222,7 @@ def generate_base_upgrade(A):
# method returns the currently needed system.base component install and # method returns the currently needed system.base component install and
# upgrade needs # upgrade needs
base = upgrade_base(A, ignore_package_conflicts = True) base = upgrade_base(A, ignore_package_conflicts = True)
return base return list(base)
def generate_conflicts(A): def generate_conflicts(A):
# returns the conflicting packages list of the to be installed packages. # returns the conflicting packages list of the to be installed packages.
pisi/operations.py
+3 -7
View File
@@ -298,7 +298,7 @@ def upgrade_base(A = set(), ignore_package_conflicts = False):
util.strlist(extra_upgrades)) util.strlist(extra_upgrades))
G_f, upgrade_order = plan_upgrade(extra_upgrades, ignore_build) G_f, upgrade_order = plan_upgrade(extra_upgrades, ignore_build)
# return packages that must be added to any installation # return packages that must be added to any installation
return install_order + upgrade_order return set(install_order + upgrade_order)
else: else:
ctx.ui.warning(_('Safety switch: the component system.base cannot be found')) ctx.ui.warning(_('Safety switch: the component system.base cannot be found'))
return set() return set()
@@ -325,7 +325,7 @@ def install_pkg_names(A, reinstall = False):
ctx.ui.info(_('No packages to install.')) ctx.ui.info(_('No packages to install.'))
return return
systembase_order = upgrade_base(A) A |= upgrade_base(A)
if not ctx.config.get_option('ignore_dependency'): if not ctx.config.get_option('ignore_dependency'):
G_f, order = plan_install_pkg_names(A) G_f, order = plan_install_pkg_names(A)
@@ -333,8 +333,6 @@ def install_pkg_names(A, reinstall = False):
G_f = None G_f = None
order = list(A) order = list(A)
order = systembase_order + order
if len(order) > 1: if len(order) > 1:
ctx.ui.info(_("Following packages will be installed in the respective " ctx.ui.info(_("Following packages will be installed in the respective "
"order to satisfy dependencies:\n") + util.strlist(order)) "order to satisfy dependencies:\n") + util.strlist(order))
@@ -450,7 +448,7 @@ def upgrade_pkg_names(A = []):
ctx.ui.info(_('No packages to upgrade.')) ctx.ui.info(_('No packages to upgrade.'))
return True return True
systembase_order = upgrade_base(A) A |= upgrade_base(A)
ctx.ui.debug('A = %s' % str(A)) ctx.ui.debug('A = %s' % str(A))
@@ -460,8 +458,6 @@ def upgrade_pkg_names(A = []):
G_f = None G_f = None
order = list(A) order = list(A)
order = systembase_order + order
if not ctx.get_option('ignore_package_conflicts'): if not ctx.get_option('ignore_package_conflicts'):
conflicts = check_conflicts(order, ctx.packagedb) conflicts = check_conflicts(order, ctx.packagedb)