From: Michael Tremer Date: Sun, 17 Jul 2011 13:49:37 +0000 (+0200) Subject: Add search attributes to _pakfire.so module. X-Git-Tag: 0.9.3~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=884cd2fb963cd93b976bec2af3e3d700824bef8e;p=pakfire.git Add search attributes to _pakfire.so module. --- diff --git a/pakfire/base.py b/pakfire/base.py index c1673365c..3b47a4de8 100644 --- a/pakfire/base.py +++ b/pakfire/base.py @@ -208,7 +208,7 @@ class Pakfire(object): def search(self, pattern): # Do the search. pkgs = [] - for solv in self.pool.search(pattern): + for solv in self.pool.search(pattern, satsolver.SEARCH_STRING|satsolver.SEARCH_FILES): pkgs.append(packages.SolvPackage(self, solv)) # Return the output as a package listing. diff --git a/src/_pakfiremodule.c b/src/_pakfiremodule.c index 54a671f3b..d4fff1493 100644 --- a/src/_pakfiremodule.c +++ b/src/_pakfiremodule.c @@ -206,4 +206,14 @@ void init_pakfire(void) { PyDict_SetItemString(d, "REL_GT", Py_BuildValue("i", REL_GT)); PyDict_SetItemString(d, "REL_LE", Py_BuildValue("i", REL_LT|REL_EQ)); PyDict_SetItemString(d, "REL_GE", Py_BuildValue("i", REL_GT|REL_EQ)); + + // Add constants for search + PyDict_SetItemString(d, "SEARCH_STRING", Py_BuildValue("i", SEARCH_STRING)); + PyDict_SetItemString(d, "SEARCH_STRINGSTART", Py_BuildValue("i", SEARCH_STRINGSTART)); + PyDict_SetItemString(d, "SEARCH_STRINGEND", Py_BuildValue("i", SEARCH_STRINGEND)); + PyDict_SetItemString(d, "SEARCH_SUBSTRING", Py_BuildValue("i", SEARCH_SUBSTRING)); + PyDict_SetItemString(d, "SEARCH_GLOB", Py_BuildValue("i", SEARCH_GLOB)); + PyDict_SetItemString(d, "SEARCH_REGEX", Py_BuildValue("i", SEARCH_REGEX)); + PyDict_SetItemString(d, "SEARCH_FILES", Py_BuildValue("i", SEARCH_FILES)); + PyDict_SetItemString(d, "SEARCH_CHECKSUMS", Py_BuildValue("i", SEARCH_CHECKSUMS)); }