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
-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)
+0200'>2014-04-22insert: exit with error if EOFJason A. Donenfeld1-2/+2 2014-04-21insert: Go to top of loop if invalid read.Jason A. Donenfeld1-2/+2 2014-04-21makefile: install completion automatically and adjust lib pathsJason A. Donenfeld1-12/+30 2014-04-20Use sort -u instead of uniqJason A. Donenfeld1-2/+2 2014-04-20Don't use subshells for reading from find.Jason A. Donenfeld1-4/+4 2014-04-19bash-completion: fix completion-file's name in uninstallschalox1-1/+1 2014-04-19platform: Auto-detect local platform fileJason A. Donenfeld2-3/+3 2014-04-19platform: Allow custom platform file before installJason A. Donenfeld2-3/+5 2014-04-18reencrypt: cleaner temp file declarationJason A. Donenfeld1-4/+4 2014-04-18Remove unneeded semicolon.Jason A. Donenfeld1-14/+14 2014-04-18Check sneaky paths.Jason A. Donenfeld1-0/+15 2014-04-18Pruning: turns out rmdir does it for us with -p.Jason A. Donenfeld1-9/+3 2014-04-18Abstract remove empty directories into function.Jason A. Donenfeld1-14/+11 2014-04-18Remember to prune empty folders.Jason A. Donenfeld1-0/+8 2014-04-18init: allow deinitializationJason A. Donenfeld2-2/+18 2014-04-18bash-completion: filter dot files from resultsJason A. Donenfeld1-3/+8 2014-04-18reencrypt: remove option, do automaticallyJason A. Donenfeld5-39/+25 2014-04-18reencryption: add to completion filesJason A. Donenfeld3-1/+5 2014-04-18Specify variable gpg.Jason A. Donenfeld1-1/+1 2014-04-18style: don't escape new line on &&Jason A. Donenfeld1-2/+2 2014-04-18reencryption: remove temporary file on failureJason A. Donenfeld1-1/+1 2014-04-18reencryption: only reencrypt files when requiredJason A. Donenfeld2-16/+37 2014-04-17cp: typo as cvJason A. Donenfeld1-1/+1 2014-04-17bash: gpg_id is localJason A. Donenfeld1-0/+1 2014-04-17move/copy: always reencrypt passwords at destinationJason A. Donenfeld5-25/+56 2014-04-17makefile: allow platform files with gnu sedJason A. Donenfeld1-7/+8 2014-04-17mv: Add pass mv/rename supportJason A. Donenfeld5-3/+78 2014-04-17revelation2pass: add plain XML importJavali1-11/+15 2014-04-17platform: add cygwin supportJason A. Donenfeld2-1/+17