From 65662dd187d5580e721147f83681d56da014e71d Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Fri, 5 Jun 2009 12:07:09 +0000 Subject: [PATCH] a place to keep some experimental patches --- patches/no-need-for-upgrade-order.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 patches/no-need-for-upgrade-order.patch diff --git a/patches/no-need-for-upgrade-order.patch b/patches/no-need-for-upgrade-order.patch new file mode 100644 index 00000000..0bf02b4b --- /dev/null +++ b/patches/no-need-for-upgrade-order.patch @@ -0,0 +1,22 @@ +Index: pisi/operations/upgrade.py +=================================================================== +--- pisi/operations/upgrade.py (revision 23095) ++++ pisi/operations/upgrade.py (working copy) +@@ -244,15 +244,12 @@ + if extra_installs: + ctx.ui.warning(_('Safety switch: Following packages in system.base will be installed: ') + + util.strlist(extra_installs)) +- G_f, install_order = operations.install.plan_install_pkg_names(extra_installs) +- extra_upgrades = filter(lambda x: is_upgradable(x, ignore_build), systembase - set(install_order)) +- upgrade_order = [] ++ extra_upgrades = filter(lambda x: is_upgradable(x, ignore_build), systembase - set(extra_installs)) + if extra_upgrades: + ctx.ui.warning(_('Safety switch: Following packages in system.base will be upgraded: ') + + util.strlist(extra_upgrades)) +- G_f, upgrade_order = plan_upgrade(extra_upgrades) + # return packages that must be added to any installation +- return set(install_order + upgrade_order) ++ return set(extra_installs + extra_upgrades) + else: + ctx.ui.warning(_('Safety switch: the component system.base cannot be found')) + return set()