summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2008-09-12 15:09:02 +0200
committerRené 'Necoro' Neumann <necoro@necoro.net>2008-09-12 15:09:02 +0200
commit1f3131c2ce0617ab3f1828bff6231339ff4c9152 (patch)
tree01994c56b6996b09eabdc30a04334989c28fbbf3
parent978f7b6d8a6c0851abf31ba71fad68be1d34d566 (diff)
downloadportato-1f3131c2ce0617ab3f1828bff6231339ff4c9152.tar.gz
portato-1f3131c2ce0617ab3f1828bff6231339ff4c9152.tar.bz2
portato-1f3131c2ce0617ab3f1828bff6231339ff4c9152.zip
Fixed portage-2.1.4.4 bug with sets
Diffstat (limited to '')
-rw-r--r--portato/backend/portage/sets.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/portato/backend/portage/sets.py b/portato/backend/portage/sets.py
index 8d8ef28..24dd89a 100644
--- a/portato/backend/portage/sets.py
+++ b/portato/backend/portage/sets.py
@@ -55,13 +55,13 @@ class FilterSet (Set):
def get_pkgs (self, key, is_regexp, masked, with_version, only_cpv):
t = set()
for pkg in self.get_list():
- if is_regexp:
+ if is_regexp and key:
if not re.match(key, pkg, re.I): continue
if not with_version:
t.add(portage_dep.dep_getkey(pkg))
-
- t.add(system.find_best_match(pkg, only_cpv = True))
+ else:
+ t.add(system.find_best_match(pkg, only_cpv = True))
return t
@@ -102,7 +102,7 @@ class InstalledSet (Set):
t = filter(lambda x: re.match(key, x, re.I), t)
return set(t)
- else:
+ else:
return set(system.settings.vartree.dbapi.match(key))
class TreeSet (Set):
@@ -117,7 +117,7 @@ class TreeSet (Set):
if key:
t = filter(lambda x: re.match(key, x, re.I), t)
- elif masked:
+ elif masked:
t = system.settings.porttree.dbapi.xmatch("match-all", key)
else:
t = system.settings.porttree.dbapi.match(key)