From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 7 Dec 2016 21:44:03 +0000 (+0100)
Subject: Move search() to PakfireContext
X-Git-Tag: 0.9.28~1285^2~1383
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d063a356ba5dd73ce15464a06b2bccf922f90a2d;p=pakfire.git

Move search() to PakfireContext

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/pakfire/base.py b/src/pakfire/base.py
index 07f63d2e3..3d45e340f 100644
--- a/src/pakfire/base.py
+++ b/src/pakfire/base.py
@@ -426,23 +426,6 @@ class Pakfire(object):
 		# Process the transaction.
 		t.run()
 
-	def search(self, pattern):
-		# Do the search.
-		pkgs = {}
-		for solv in self.pool.search(pattern, satsolver.SEARCH_STRING|satsolver.SEARCH_FILES):
-			pkg = packages.SolvPackage(self, solv)
-
-			# Check, if a package with the name is already in the resultset
-			# and always replace older ones by more recent ones.
-			if pkg.name in pkgs:
-				if pkgs[pkg.name] < pkg:
-					pkgs[pkg.name] = pkg
-			else:
-				pkgs[pkg.name] = pkg
-
-		# Return a list of the packages, alphabetically sorted.
-		return sorted(pkgs.values())
-
 	def groupinstall(self, group, **kwargs):
 		self.install("@%s" % group, **kwargs)
 
@@ -559,6 +542,23 @@ class PakfireContext(object):
 
 		return sorted(pkgs)
 
+	def search(self, pattern):
+		# Do the search.
+		pkgs = {}
+		for solv in self.pakfire.pool.search(pattern, satsolver.SEARCH_STRING|satsolver.SEARCH_FILES):
+			pkg = packages.SolvPackage(self.pakfire, solv)
+
+			# Check, if a package with the name is already in the resultset
+			# and always replace older ones by more recent ones.
+			if pkg.name in pkgs:
+				if pkgs[pkg.name] < pkg:
+					pkgs[pkg.name] = pkg
+			else:
+				pkgs[pkg.name] = pkg
+
+		# Return a list of the packages, alphabetically sorted.
+		return sorted(pkgs.values())
+
 
 class PakfireBuilder(Pakfire):
 	mode = "builder"