From ae63d36e760b749b97332915b8a91dd6f9ece199 Mon Sep 17 00:00:00 2001 From: necoro <> Date: Thu, 16 Aug 2007 17:33:21 +0000 Subject: improved update-world --- portato/gui/gui_helper.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'portato/gui') diff --git a/portato/gui/gui_helper.py b/portato/gui/gui_helper.py index 110b241..87fcf69 100644 --- a/portato/gui/gui_helper.py +++ b/portato/gui/gui_helper.py @@ -369,17 +369,25 @@ class EmergeQueue: elif cmp < 0: downgrade = True - if cmp != 0: - uVersion = old.get_version() + uVersion = old.get_version() - old_iuse = set(old.get_iuse_flags()) - new_iuse = set(pkg.get_iuse_flags()) + old_iuse = set(old.get_iuse_flags()) + new_iuse = set(pkg.get_iuse_flags()) - for i in old_iuse.difference(new_iuse): - changedUse.append("-"+i) + for i in old_iuse.difference(new_iuse): + changedUse.append("-"+i) - for i in new_iuse.difference(old_iuse): - changedUse.append("+"+i) + for i in new_iuse.difference(old_iuse): + changedUse.append("+"+i) + else: + old_iuse = set(pkg.get_iuse_flags(installed = True)) + new_iuse = set(pkg.get_iuse_flags(installed = False)) + + for i in old_iuse.difference(new_iuse): + changedUse.append("-"+i) + + for i in new_iuse.difference(old_iuse): + changedUse.append("+"+i) except backend.PackageNotFoundException, e: # package not found / package is masked -> delete current tree and re-raise the exception if self.tree.iter_has_parent(it): -- cgit v1.2.3-70-g09d2