diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2010-04-13 03:17:48 +0200 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2010-04-13 03:17:48 +0200 |
| commit | 06f03d7aa376c8164eff5068a412e76cf2c0b0a9 (patch) | |
| tree | bf54e073cd7fd6e09c08aed2c84374c1e88f3d2d /portato/backend/portage/system.py | |
| parent | a2cbc2cd786477aaf11784d37687f1c1f9c92e16 (diff) | |
| parent | 673edfd36e1d02a629838d3a408155779af50912 (diff) | |
| download | portato-06f03d7aa376c8164eff5068a412e76cf2c0b0a9.tar.gz portato-06f03d7aa376c8164eff5068a412e76cf2c0b0a9.tar.bz2 portato-06f03d7aa376c8164eff5068a412e76cf2c0b0a9.zip | |
Merge branch '0.14'
Conflicts:
portato/backend/portage/sets.py
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 7e70f3b..a7fea5d 100644 --- a/portato/backend/portage/system.py +++ b/portato/backend/portage/system.py @@ -191,10 +191,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)) |