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

* generate_base_upgrade needs it

Browse Source
This commit is contained in:
Faik Uygur
2006-10-27 21:25:41 +00:00
parent 5e0e730d1c
commit e9bf4dd160
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/api.py
+1 -1
View File
@@ -216,7 +216,7 @@ def generate_base_upgrade(A):
# all the packages of the system.base must be installed on the system. # all the packages of the system.base must be installed on the system.
# 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) base = upgrade_base(A, ignore_package_conflicts = True)
return list(base) return list(base)
def configure_pending(): def configure_pending():
pisi/operations.py
+2 -2
View File
@@ -283,7 +283,7 @@ def is_upgradable(name, ignore_build = False):
else: else:
return build < pkg.build return build < pkg.build
def upgrade_base(A = set()): def upgrade_base(A = set(), ignore_package_conflicts = False):
ignore_build = ctx.get_option('ignore_build_no') ignore_build = ctx.get_option('ignore_build_no')
if not ctx.get_option('ignore_safety'): if not ctx.get_option('ignore_safety'):
if ctx.componentdb.has_component('system.base'): if ctx.componentdb.has_component('system.base'):
@@ -292,7 +292,7 @@ def upgrade_base(A = set()):
if extra_installs: if extra_installs:
ctx.ui.warning(_('Safety switch: Following packages in system.base will be installed: ') + ctx.ui.warning(_('Safety switch: Following packages in system.base will be installed: ') +
util.strlist(extra_installs)) util.strlist(extra_installs))
G_f, install_order = plan_install_pkg_names(extra_installs) G_f, install_order = plan_install_pkg_names(extra_installs, ignore_package_conflicts)
extra_upgrades = filter(lambda x: is_upgradable(x, ignore_build), systembase - set(install_order)) extra_upgrades = filter(lambda x: is_upgradable(x, ignore_build), systembase - set(install_order))
upgrade_order = [] upgrade_order = []
if extra_upgrades: if extra_upgrades: