Add option to configure multiinstall packages.

diff --git a/pakfire/base.py b/pakfire/base.py
index ad68d0b75b04b9da43854870d6e7926545d47dd3..50d33eb2d96ac09cbf0b371f8371cc63f481fa92 100644 (file)
--- a/pakfire/base.py
+++ b/pakfire/base.py
@@ -72,8 +72,14 @@ class Pakfire(object):
        def create_solver(self):
                return satsolver.Solver(self, self.pool)
 
-       def create_request(self):
-               return satsolver.Request(self.pool)
+       def create_request(self, builder=False):
+               request = satsolver.Request(self.pool)
+
+               # Add multiinstall information.
+               for solv in PAKFIRE_MULTIINSTALL:
+                       request.noobsoletes(solv)
+
+               return request
 
        def create_relation(self, s):
                assert s

diff --git a/pakfire/constants.py b/pakfire/constants.py
index e61acfe1322f331f63233965a73a23338e09b11a..57eb66df59915155d7feac3b807057ea86353736 100644 (file)
--- a/pakfire/constants.py
+++ b/pakfire/constants.py
@@ -103,3 +103,6 @@ PKG_PAYLOAD_COMP="%(payload_comp)s"
 PKG_PAYLOAD_HASH1="%(payload_hash1)s"
 
 """
+
+# XXX make this configurable in pakfire.conf
+PAKFIRE_MULTIINSTALL = ["kernel",]

diff --git a/pakfire/satsolver.py b/pakfire/satsolver.py
index 3029fb423c28703a186f9b384546f820a23d4a10..f358abe39bb902ef195c41595861a4364ac5ced4 100644 (file)
--- a/pakfire/satsolver.py
+++ b/pakfire/satsolver.py
@@ -71,6 +71,21 @@ class Request(_pakfire.Request):
 
                raise Exception, "Unknown type"
 
+       def noobsoletes(self, what):
+               if isinstance(what, Solvable):
+                       self.noobsoletes_solvable(what)
+                       return
+
+               elif isinstance(what, Relation):
+                       self.noobsoletes_relation(what)
+                       return
+
+               elif type(what) == type("string"):
+                       self.noobsoletes_name(what)
+                       return
+
+               raise Exception, "Unknown type"
+
 
 class Solver(object):
        def __init__(self, pakfire, pool):

diff --git a/po/pakfire.pot b/po/pakfire.pot
index 5f2dca03d077cc325becb5cd57a05dede666b23b..19b3fcf111b6686261827049a239784c4896c045 100644 (file)
--- a/po/pakfire.pot
+++ b/po/pakfire.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-31 19:16+0000\n"
+"POT-Creation-Date: 2011-07-31 19:32+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,16 +38,16 @@ msgstr ""
 msgid "Downgrading"
 msgstr ""
 
-#: ../pakfire/base.py:150 ../pakfire/base.py:192 ../pakfire/base.py:222
-#: ../pakfire/base.py:243
+#: ../pakfire/base.py:156 ../pakfire/base.py:198 ../pakfire/base.py:228
+#: ../pakfire/base.py:249
 msgid "Nothing to do"
 msgstr ""
 
-#: ../pakfire/base.py:178
+#: ../pakfire/base.py:184
 msgid "There are no packages to install."
 msgstr ""
 
-#: ../pakfire/base.py:439
+#: ../pakfire/base.py:445
 msgid "Everything is fine."
 msgstr ""
 
@@ -372,33 +372,33 @@ msgstr ""
 msgid "Loading installed packages"
 msgstr ""
 
-#: ../pakfire/satsolver.py:114
+#: ../pakfire/satsolver.py:129
 msgid "The solver returned one problem:"
 msgstr ""
 
 #. Ask the user if he or she want to modify the request. If not, just exit.
-#: ../pakfire/satsolver.py:130
+#: ../pakfire/satsolver.py:145
 msgid "Do you want to manually alter the request?"
 msgstr ""
 
-#: ../pakfire/satsolver.py:133
+#: ../pakfire/satsolver.py:148
 msgid "You can now try to satisfy the solver by modifying your request."
 msgstr ""
 
-#: ../pakfire/satsolver.py:138
+#: ../pakfire/satsolver.py:153
 msgid "Which problem to you want to resolve?"
 msgstr ""
 
-#: ../pakfire/satsolver.py:140
+#: ../pakfire/satsolver.py:155
 msgid "Press enter to try to re-solve the request."
 msgstr ""
 
-#: ../pakfire/satsolver.py:171
+#: ../pakfire/satsolver.py:186
 #, python-format
 msgid "    Solution: %s"
 msgstr ""
 
-#: ../pakfire/satsolver.py:180
+#: ../pakfire/satsolver.py:195
 msgid "    Solutions:"
 msgstr ""
 

diff --git a/src/_pakfiremodule.c b/src/_pakfiremodule.c
index 16370497413a1056444fbfb82beca18b98d53399..610096ba0974734e7b9fcf50b137104654111775 100644 (file)
--- a/src/_pakfiremodule.c
+++ b/src/_pakfiremodule.c
@@ -48,6 +48,9 @@ static PyMethodDef Request_methods[] = {
        {"lock_solvable", (PyCFunction)Request_lock_solvable, METH_VARARGS, NULL},
        {"lock_relation", (PyCFunction)Request_lock_relation, METH_VARARGS, NULL},
        {"lock_name", (PyCFunction)Request_lock_name, METH_VARARGS, NULL},
+       {"noobsoletes_solvable", (PyCFunction)Request_noobsoletes_solvable, METH_VARARGS, NULL},
+       {"noobsoletes_relation", (PyCFunction)Request_noobsoletes_relation, METH_VARARGS, NULL},
+       {"noobsoletes_name", (PyCFunction)Request_noobsoletes_name, METH_VARARGS, NULL},
        { NULL, NULL, 0, NULL }
 };
 

diff --git a/src/request.c b/src/request.c
index 7c7fb64a417b3a608f0ead260db2d6a325bdf496..bd1ea50b471f023bb204abb15b73167e542b55bc 100644 (file)
--- a/src/request.c
+++ b/src/request.c
@@ -206,3 +206,40 @@ PyObject *Request_lock_name(RequestObject *self, PyObject *args) {
 
        Py_RETURN_NONE;
 }
+
+PyObject *Request_noobsoletes_solvable(RequestObject *self, PyObject *args) {
+       SolvableObject *solv;
+
+       if (!PyArg_ParseTuple(args, "O", &solv)) {
+               /* XXX raise exception */
+       }
+
+       _Request_solvable(self, SOLVER_NOOBSOLETES, solv->_id);
+
+       Py_RETURN_NONE;
+}
+
+PyObject *Request_noobsoletes_relation(RequestObject *self, PyObject *args) {
+       RelationObject *rel;
+
+       if (!PyArg_ParseTuple(args, "O", &rel)) {
+               /* XXX raise exception */
+       }
+
+       _Request_relation(self, SOLVER_NOOBSOLETES, rel->_id);
+
+       Py_RETURN_NONE;
+}
+
+PyObject *Request_noobsoletes_name(RequestObject *self, PyObject *args) {
+       const char *name;
+
+       if (!PyArg_ParseTuple(args, "s", &name)) {
+               /* XXX raise exception */
+       }
+
+       Id _name = pool_str2id(self->_pool, name, 1);
+       _Request_name(self, SOLVER_NOOBSOLETES, _name);
+
+       Py_RETURN_NONE;
+}

diff --git a/src/request.h b/src/request.h
index ae0dc67b2960958e18e4e31dd8da80dd8a244dce..a8c93c301521756e6351dabbe8b89f5207994918 100644 (file)
--- a/src/request.h
+++ b/src/request.h
@@ -36,6 +36,10 @@ extern PyObject *Request_lock_solvable(RequestObject *self, PyObject *args);
 extern PyObject *Request_lock_relation(RequestObject *self, PyObject *args);
 extern PyObject *Request_lock_name(RequestObject *self, PyObject *args);
 
+extern PyObject *Request_noobsoletes_solvable(RequestObject *self, PyObject *args);
+extern PyObject *Request_noobsoletes_relation(RequestObject *self, PyObject *args);
+extern PyObject *Request_noobsoletes_name(RequestObject *self, PyObject *args);
+
 extern PyTypeObject RequestType;
 
 #endif