diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2010-04-13 03:10:02 +0200 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2010-04-13 03:14:16 +0200 |
| commit | 673edfd36e1d02a629838d3a408155779af50912 (patch) | |
| tree | 21c84e7c3d6ab67ca9c59551da5cbeb656dd2522 /portato/backend/portage/system.py | |
| parent | 60e95e660fcb0e813894a975275b56a0528a776f (diff) | |
| download | portato-673edfd36e1d02a629838d3a408155779af50912.tar.gz portato-673edfd36e1d02a629838d3a408155779af50912.tar.bz2 portato-673edfd36e1d02a629838d3a408155779af50912.zip | |
Fix the handling of FilterSets. Fixes bug #558887.
Now FilterSets are a subclass of InstalledSet. And return only these
packages, which are installed ... but then all of them.
Diffstat (limited to '')
| -rw-r--r-- | portato/backend/portage/system.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py index 3aaa060..990a39a 100644 --- a/portato/backend/portage/system.py +++ b/portato/backend/portage/system.py @@ -209,10 +209,11 @@ class PortageSystem (SystemInterface): t = self.find_packages(search_key, pkgSet = pkgSet, masked = masked, with_version = True, only_cpv = True) - if VERSION >= (2,1,5): - t += [pkg.get_cpv() for pkg in self.find_packages(search_key, self.SET_INSTALLED) if not (pkg.is_testing(True) or pkg.is_masked())] - elif not only_installed: # no need to run twice - t += self.find_packages(search_key, self.SET_INSTALLED, only_cpv=True) + if not only_installed: + if VERSION >= (2,1,5): + t += [pkg.get_cpv() for pkg in self.find_packages(search_key, self.SET_INSTALLED) if not (pkg.is_testing(True) or pkg.is_masked())] + else: # no need to run twice + t += self.find_packages(search_key, self.SET_INSTALLED, only_cpv=True) if t: t = list(set(t)) |