diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2008-06-19 11:27:20 +0200 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2008-06-19 11:27:20 +0200 |
| commit | 441784d7b54c5aefe1ba1dd5526bdc5ac960e4e5 (patch) | |
| tree | 5562fc5377f9592a6293735e8baf78230a1a48a6 /portato/gui | |
| parent | 52f04fc6cccffa7cf31a4d7eab9c9b341f77a293 (diff) | |
| parent | 48f046aec4df3b09906ca41e2c75ce7e0fb045a6 (diff) | |
| download | portato-441784d7b54c5aefe1ba1dd5526bdc5ac960e4e5.tar.gz portato-441784d7b54c5aefe1ba1dd5526bdc5ac960e4e5.tar.bz2 portato-441784d7b54c5aefe1ba1dd5526bdc5ac960e4e5.zip | |
Merged in unify
Diffstat (limited to 'portato/gui')
| -rw-r--r-- | portato/gui/queue.py | 4 | ||||
| -rw-r--r-- | portato/gui/utils.py | 4 | ||||
| -rw-r--r-- | portato/gui/windows/main.py | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/portato/gui/queue.py b/portato/gui/queue.py index be43e3a..ce7e620 100644 --- a/portato/gui/queue.py +++ b/portato/gui/queue.py @@ -143,7 +143,7 @@ class EmergeQueue: try: pkg = self._get_pkg_from_cpv(cpv, unmask) if not pkg.is_installed(): - old = system.find_installed_packages(pkg.get_slot_cp()) + old = system.find_packages(pkg.get_slot_cp(), "installed") if old: old = old[0] # assume we have only one there cmp = pkg.compare_version(old) @@ -272,7 +272,7 @@ class EmergeQueue: # get the blocks that block an installed package inst = [] for block in self.blocks[type]: - pkgs = system.find_installed_packages(block) + pkgs = system.find_packages(block, "installed") if pkgs: inst.append((pkgs, block)) diff --git a/portato/gui/utils.py b/portato/gui/utils.py index dc9b9f3..0a2930b 100644 --- a/portato/gui/utils.py +++ b/portato/gui/utils.py @@ -165,8 +165,8 @@ class Database (object): """ # get the lists - packages = system.find_all_packages(name = category, withVersion = False) - installed = system.find_all_installed_packages(name = category, withVersion = False) + packages = system.find_packages(category, with_version = False) + installed = system.find_packages(category, "installed", with_version = False) # cycle through packages for p in packages: diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index 0d40968..b675d17 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -156,7 +156,7 @@ class PackageTable: self.descLabel.set_label(desc) # overlay - if pkg.is_overlay(): + if pkg.is_in_overlay(): self.overlayLabel.set_label(pkg.get_overlay_path()) self.overlayLabel.show() self.overlayLL.show() @@ -1316,7 +1316,7 @@ class MainWindow (Window): if pkg.is_installed(): installed = set(pkg.get_iuse_flags()).intersection(pkg.get_installed_use_flags()) else: - inst = system.find_installed_packages(pkg.get_slot_cp()) + inst = system.find_packages(pkg.get_slot_cp(), "installed") if inst: installed = set(inst[0].get_iuse_flags()).intersection(inst[0].get_installed_use_flags()) else: @@ -1492,7 +1492,7 @@ class MainWindow (Window): if "/" not in text: text = "/.*"+text # only look for package names - packages = system.find_all_packages(text, withVersion = False) + packages = system.find_packages(text, with_version = False) if packages == []: nothing_found_dialog() |