From c8ab8375fe4f719ca484b0f395fd3812c73444aa Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Thu, 17 Apr 2008 10:25:39 +0200 Subject: Changed 'is_overlay' to 'is_in_overlay' --- portato/gui/windows/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'portato/gui') diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index 99739ae..1962e12 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -173,7 +173,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() -- cgit v1.2.3-54-g00ecf From 9ecb704361e551d02ef0a9d4a88f217e59e48c8d Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 21 May 2008 20:27:05 +0200 Subject: Ported to new find_packages API --- portato/backend/portage/system.py | 10 +++++----- portato/gui/queue.py | 2 +- portato/gui/utils.py | 4 ++-- portato/gui/windows/main.py | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'portato/gui') diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py index 8536292..8aebb85 100644 --- a/portato/backend/portage/system.py +++ b/portato/backend/portage/system.py @@ -337,7 +337,7 @@ class PortageSystem (SystemInterface): return new_packages def get_updated_packages (self): - packages = self.get_new_packages(self.find_all_installed_packages(withVersion = False)) + packages = self.get_new_packages(self.find_packages(set = "installed", withVersion = False)) packages = [x for x in packages if x is not None and not x.is_installed()] return packages @@ -353,7 +353,7 @@ class PortageSystem (SystemInterface): world.close() # append system packages - packages.extend(unique_array([p.get_cp() for p in self.find_all_system_packages()])) + packages.extend(unique_array([p.get_cp() for p in self.find_packages(set = "system")])) states = [(["RDEPEND"], True)] if self.with_bdeps(): @@ -379,11 +379,11 @@ class PortageSystem (SystemInterface): tempDeep = False if not p.is_installed(): - oldList = self.find_installed_packages(p.get_slot_cp()) + oldList = self.find_packages(p.get_slot_cp(), "installed") if oldList: old = oldList[0] # we should only have one package here - else it is a bug else: - oldList = self.sort_package_list(self.find_installed_packages(p.get_cp())) + oldList = self.sort_package_list(self.find_packages(p.get_cp(), "installed")) if not oldList: info(_("Found a not installed dependency: %s.") % p.get_cpv()) oldList = [p] @@ -433,7 +433,7 @@ class PortageSystem (SystemInterface): if not pkg: continue if pkg.is_masked() or pkg.is_testing(True): # check to not update unnecessairily cont = False - for inst in self.find_installed_packages(pkg.get_cp(), only_cpv = True): + for inst in self.find_packages(pkg.get_cp(), "installed", only_cpv = True): if self.cpv_matches(inst, i): debug("The installed %s matches %s. Discarding upgrade to masked version.", inst, i) cont = True diff --git a/portato/gui/queue.py b/portato/gui/queue.py index eb0a43e..a75048d 100644 --- a/portato/gui/queue.py +++ b/portato/gui/queue.py @@ -139,7 +139,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) diff --git a/portato/gui/utils.py b/portato/gui/utils.py index 151ec22..01a6b2f 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, withVersion = False) + installed = system.find_packages(category, set = "installed", withVersion = False) # cycle through packages for p in packages: diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index 1962e12..787bb28 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -145,7 +145,7 @@ class PackageTable: self.instPackages = self.packages = system.find_packages("=%s-%s" % (cp, version), masked = True) else: self.packages = system.sort_package_list(system.find_packages(cp, masked = True)) - self.instPackages = system.sort_package_list(system.find_installed_packages(cp, masked = True)) + self.instPackages = system.sort_package_list(system.find_packages(cp, "installed", masked = True)) # version-combo-box self.versionList.get_model().clear() @@ -1252,7 +1252,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: @@ -1428,7 +1428,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, withVersion = False) if packages == []: nothing_found_dialog() -- cgit v1.2.3-54-g00ecf From 3023e6997fbd591667398b992c490d237205c85b Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 21 May 2008 20:29:51 +0200 Subject: Ported to new find_packages API #2: withVersion --> with_version --- portato/backend/portage/system.py | 2 +- portato/gui/utils.py | 4 ++-- portato/gui/windows/main.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'portato/gui') diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py index 8aebb85..adb9799 100644 --- a/portato/backend/portage/system.py +++ b/portato/backend/portage/system.py @@ -337,7 +337,7 @@ class PortageSystem (SystemInterface): return new_packages def get_updated_packages (self): - packages = self.get_new_packages(self.find_packages(set = "installed", withVersion = False)) + packages = self.get_new_packages(self.find_packages(set = "installed", with_version = False)) packages = [x for x in packages if x is not None and not x.is_installed()] return packages diff --git a/portato/gui/utils.py b/portato/gui/utils.py index 01a6b2f..7a3e8ee 100644 --- a/portato/gui/utils.py +++ b/portato/gui/utils.py @@ -165,8 +165,8 @@ class Database (object): """ # get the lists - packages = system.find_packages(category, withVersion = False) - installed = system.find_packages(category, set = "installed", withVersion = False) + packages = system.find_packages(category, with_version = False) + installed = system.find_packages(category, set = "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 787bb28..2c9eade 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -1428,7 +1428,7 @@ class MainWindow (Window): if "/" not in text: text = "/.*"+text # only look for package names - packages = system.find_packages(text, withVersion = False) + packages = system.find_packages(text, with_version = False) if packages == []: nothing_found_dialog() -- cgit v1.2.3-54-g00ecf From 406603141a35e2be08e559fc9ec090c6c968b596 Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 21 May 2008 20:37:09 +0200 Subject: Fixed errors, so the app starts --- portato/backend/portage/system.py | 14 ++++++++------ portato/backend/system_interface.py | 2 +- portato/gui/utils.py | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'portato/gui') diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py index adb9799..f92e34e 100644 --- a/portato/backend/portage/system.py +++ b/portato/backend/portage/system.py @@ -162,21 +162,23 @@ class PortageSystem (SystemInterface): else: pkgSet = "installed" - t = self.find_packages(search_key, pkgSet = pkgSet, masked = masked, with_version = True) + t = self.find_packages(search_key, pkgSet = pkgSet, masked = masked, with_version = True, only_cpv = True) if t: return self.find_best(t) - return t + return self.geneticize_list(t, only_cpv) def find_packages (self, key = "", pkgSet = "all", masked = False, with_version = True, only_cpv = False): - + if key is None: key = "" + is_regexp = key == "" or ("*" in key and key[0] not in ("*","=","<",">","~","!")) def installed(key): if is_regexp: if with_version: t = self.settings.vartree.dbapi.cpv_all() + else: t = self.settings.vartree.dbapi.cp_all() if key: @@ -259,7 +261,7 @@ class PortageSystem (SystemInterface): t = unique_array(t) t.sort() - return geneticize_list(t, only_cpv or not with_version) + return self.geneticize_list(t, only_cpv or not with_version) def __find_resolved_unresolved (self, list, check, only_cpv = False): """Checks a given list and divides it into a "resolved" and an "unresolved" part. @@ -337,7 +339,7 @@ class PortageSystem (SystemInterface): return new_packages def get_updated_packages (self): - packages = self.get_new_packages(self.find_packages(set = "installed", with_version = False)) + packages = self.get_new_packages(self.find_packages(pkgSet = "installed", with_version = False)) packages = [x for x in packages if x is not None and not x.is_installed()] return packages @@ -353,7 +355,7 @@ class PortageSystem (SystemInterface): world.close() # append system packages - packages.extend(unique_array([p.get_cp() for p in self.find_packages(set = "system")])) + packages.extend(unique_array([p.get_cp() for p in self.find_packages(pkgSet = "system")])) states = [(["RDEPEND"], True)] if self.with_bdeps(): diff --git a/portato/backend/system_interface.py b/portato/backend/system_interface.py index c22c857..4b0f8df 100644 --- a/portato/backend/system_interface.py +++ b/portato/backend/system_interface.py @@ -75,7 +75,7 @@ class SystemInterface (object): raise NotImplementedError - def find_packages (self, key, set = "all", masked = False, with_version = True, only_cpv = False): + def find_packages (self, key, pkgSet = "all", masked = False, with_version = True, only_cpv = False): """This returns a list of packages matching the key. As key, it is allowed to use basic regexps (".*") and the normal package specs. But not a combination of them. diff --git a/portato/gui/utils.py b/portato/gui/utils.py index 7a3e8ee..59210e1 100644 --- a/portato/gui/utils.py +++ b/portato/gui/utils.py @@ -166,7 +166,7 @@ class Database (object): # get the lists packages = system.find_packages(category, with_version = False) - installed = system.find_packages(category, set = "installed", with_version = False) + installed = system.find_packages(category, "installed", with_version = False) # cycle through packages for p in packages: -- cgit v1.2.3-54-g00ecf