Ported to new find_packages API

4 files changed, 11 insertions, 11 deletions

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()