summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2010-09-06 17:09:59 +0200
committerRené 'Necoro' Neumann <necoro@necoro.net>2010-09-06 17:09:59 +0200
commit6a25d98dfbed84d0294fbff6e0db99113c6490b4 (patch)
treed9e651c3d58072c208af1128341a79cf5580b13c
parent7e345560e77158b6b8b301abcaf959c1e832d668 (diff)
downloadportato-6a25d98dfbed84d0294fbff6e0db99113c6490b4.tar.gz
portato-6a25d98dfbed84d0294fbff6e0db99113c6490b4.tar.bz2
portato-6a25d98dfbed84d0294fbff6e0db99113c6490b4.zip
Workaround for bug#557715
-rw-r--r--portato/backend/portage/system.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py
index 030c120..b86a8f7 100644
--- a/portato/backend/portage/system.py
+++ b/portato/backend/portage/system.py
@@ -289,12 +289,15 @@ class PortageSystem (SystemInterface):
if len(inst) > 1:
myslots = set()
+ splitp = p.split('[', 1) # split away the useflags
for i in inst: # get the slots of the installed packages
myslots.add(i.get_package_settings("SLOT"))
myslots.add(best_p.get_package_settings("SLOT")) # add the slot of the best package in portage
for slot in myslots:
- crit = "%s:%s" % (p, slot)
+ crit = splitp[:]
+ crit[0] = "%s:%s" % (crit[0], slot)
+ crit = "[".join(crit) # re-add possible useflags
append(crit, self.find_best_match(crit), inst)
else:
append(p, best_p, inst)