Add "pakfire check" which checks the system for errors.

diff --git a/pakfire/api.py b/pakfire/api.py
index 88698cf7870130f54d721952de69978147ee20b3..7274b7f1002b9246d92ca5177ac599fb58554fdf 100644 (file)
--- a/pakfire/api.py
+++ b/pakfire/api.py
@@ -83,3 +83,8 @@ def clean_all(**pakfire_args):
        pakfire = Pakfire(**pakfire_args)
 
        return pakfire.clean_all()
+
+def check(**pakfire_args):
+       pakfire = Pakfire(**pakfire_args)
+
+       return pakfire.check()

diff --git a/pakfire/base.py b/pakfire/base.py
index f7f0f0bc74b407acf54544e08756c03dc2069600..ad68d0b75b04b9da43854870d6e7926545d47dd3 100644 (file)
--- a/pakfire/base.py
+++ b/pakfire/base.py
@@ -416,3 +416,32 @@ class Pakfire(object):
 
                # Clean up repository caches.
                self.repos.clean()
+
+       def check(self, downgrade=True, uninstall=True):
+               """
+                       Try to fix any errors in the system.
+               """
+               # Detect any errors in the dependency tree.
+               # For that we create an empty request and solver and try to solve
+               # something.
+               request = self.create_request()
+               solver = self.create_solver()
+
+               # XXX the solver does crash if we call it with fix_system=1,
+               # allow_downgrade=1 and uninstall=1. Need to fix this.
+               allow_downgrade = False
+               uninstall = False
+
+               t = solver.solve(request, fix_system=True, allow_downgrade=downgrade,
+                       uninstall=uninstall)
+
+               if not t:
+                       logging.info(_("Everything is fine."))
+                       return
+
+               # Ask the user if okay.
+               if not t.cli_yesno():
+                       return
+
+               # Process the transaction.
+               t.run()

diff --git a/pakfire/cli.py b/pakfire/cli.py
index dd36628895dbe93e5dd6d6a1916de69f9637c0af..f3c4d7dcae4d922c8518ea0974c56ebb4c86c8df 100644 (file)
--- a/pakfire/cli.py
+++ b/pakfire/cli.py
@@ -43,6 +43,7 @@ class Cli(object):
                self.parse_command_groupinstall()
                self.parse_command_repolist()
                self.parse_command_clean()
+               self.parse_command_check()
 
                # Finally parse all arguments from the command line and save them.
                self.args = self.parser.parse_args()
@@ -59,6 +60,7 @@ class Cli(object):
                        "groupinstall" : self.handle_groupinstall,
                        "repolist"     : self.handle_repolist,
                        "clean_all"    : self.handle_clean_all,
+                       "check"        : self.handle_check,
                }
 
        @property
@@ -179,6 +181,12 @@ class Cli(object):
                        help=_("Cleanup all temporary files."))
                sub_create.add_argument("action", action="store_const", const="clean_all")
 
+       def parse_command_check(self):
+               # Implement the "check" command
+               sub_check = self.sub_commands.add_parser("check",
+                       help=_("Check the system for any errors."))
+               sub_check.add_argument("action", action="store_const", const="check")
+
        def run(self):
                action = self.args.action
 
@@ -252,6 +260,9 @@ class Cli(object):
 
                pakfire.clean_all(**self.pakfire_args)
 
+       def handle_check(self):
+               pakfire.check(**self.pakfire_args)
+
 
 class CliBuilder(Cli):
        def __init__(self):

diff --git a/pakfire/satsolver.py b/pakfire/satsolver.py
index f2f6060b3953c8aebed62fc1f013854618381615..3029fb423c28703a186f9b384546f820a23d4a10 100644 (file)
--- a/pakfire/satsolver.py
+++ b/pakfire/satsolver.py
@@ -78,7 +78,7 @@ class Solver(object):
                self.pool = pool
 
        def solve(self, request, update=False, uninstall=False, allow_downgrade=False,
-                       interactive=False, logger=None):
+                       fix_system=False, interactive=False, logger=None):
                # If no logger was provided, we use the root logger.
                if logger is None:
                        logger = logging.getLogger()
@@ -86,6 +86,7 @@ class Solver(object):
                # Create a new solver.
                solver = _pakfire.Solver(self.pool)
 
+               solver.set_fix_system(fix_system)
                solver.set_allow_uninstall(uninstall)
                solver.set_allow_downgrade(allow_downgrade)
 

diff --git a/po/pakfire.pot b/po/pakfire.pot
index 9c457026ccf431fd4e6bc5c745d656671dd7ccb3..5f2dca03d077cc325becb5cd57a05dede666b23b 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 18:24+0000\n"
+"POT-Creation-Date: 2011-07-31 19:16+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"
@@ -47,6 +47,10 @@ msgstr ""
 msgid "There are no packages to install."
 msgstr ""
 
+#: ../pakfire/base.py:439
+msgid "Everything is fine."
+msgstr ""
+
 #: ../pakfire/builder.py:259
 #, python-format
 msgid "Extracting: %s (source)"
@@ -60,215 +64,219 @@ msgstr ""
 msgid "The path where pakfire should operate in."
 msgstr ""
 
-#: ../pakfire/cli.py:81
+#: ../pakfire/cli.py:83
 msgid "Enable verbose output."
 msgstr ""
 
-#: ../pakfire/cli.py:84
+#: ../pakfire/cli.py:86
 msgid "Path to a configuration file to load."
 msgstr ""
 
-#: ../pakfire/cli.py:87
+#: ../pakfire/cli.py:89
 msgid "Disable a repository temporarily."
 msgstr ""
 
-#: ../pakfire/cli.py:90
+#: ../pakfire/cli.py:92
 msgid "Enable a repository temporarily."
 msgstr ""
 
-#: ../pakfire/cli.py:95
+#: ../pakfire/cli.py:97
 msgid "Install one or more packages to the system."
 msgstr ""
 
-#: ../pakfire/cli.py:97
+#: ../pakfire/cli.py:99
 msgid "Give name of at least one package to install."
 msgstr ""
 
-#: ../pakfire/cli.py:103
+#: ../pakfire/cli.py:105
 msgid "Install one or more packages from the filesystem."
 msgstr ""
 
-#: ../pakfire/cli.py:105
+#: ../pakfire/cli.py:107
 msgid "Give filename of at least one package."
 msgstr ""
 
-#: ../pakfire/cli.py:111
+#: ../pakfire/cli.py:113
 msgid "Remove one or more packages from the system."
 msgstr ""
 
-#: ../pakfire/cli.py:113
+#: ../pakfire/cli.py:115
 msgid "Give name of at least one package to remove."
 msgstr ""
 
-#: ../pakfire/cli.py:119
+#: ../pakfire/cli.py:121
 msgid "Update the whole system or one specific package."
 msgstr ""
 
-#: ../pakfire/cli.py:121
+#: ../pakfire/cli.py:123
 msgid "Give a name of a package to update or leave emtpy for all."
 msgstr ""
 
-#: ../pakfire/cli.py:127
+#: ../pakfire/cli.py:129
 msgid "Print some information about the given package(s)."
 msgstr ""
 
-#: ../pakfire/cli.py:129
+#: ../pakfire/cli.py:131
 msgid "Give at least the name of one package."
 msgstr ""
 
-#: ../pakfire/cli.py:135
+#: ../pakfire/cli.py:137
 msgid "Search for a given pattern."
 msgstr ""
 
-#: ../pakfire/cli.py:137
+#: ../pakfire/cli.py:139
 msgid "A pattern to search for."
 msgstr ""
 
-#: ../pakfire/cli.py:143
+#: ../pakfire/cli.py:145
 msgid "Get a list of packages that provide a given file or feature."
 msgstr ""
 
-#: ../pakfire/cli.py:145
+#: ../pakfire/cli.py:147
 msgid "File or feature to search for."
 msgstr ""
 
-#: ../pakfire/cli.py:151
+#: ../pakfire/cli.py:153
 msgid "Get list of packages that belong to the given group."
 msgstr ""
 
-#: ../pakfire/cli.py:153
+#: ../pakfire/cli.py:155
 msgid "Group name to search for."
 msgstr ""
 
-#: ../pakfire/cli.py:159
+#: ../pakfire/cli.py:161
 msgid "Install all packages that belong to the given group."
 msgstr ""
 
-#: ../pakfire/cli.py:161
+#: ../pakfire/cli.py:163
 msgid "Group name."
 msgstr ""
 
-#: ../pakfire/cli.py:167
+#: ../pakfire/cli.py:169
 msgid "List all currently enabled repositories."
 msgstr ""
 
-#: ../pakfire/cli.py:171
+#: ../pakfire/cli.py:173
 msgid "Cleanup commands."
 msgstr ""
 
-#: ../pakfire/cli.py:179
+#: ../pakfire/cli.py:181
 msgid "Cleanup all temporary files."
 msgstr ""
 
-#: ../pakfire/cli.py:239 ../pakfire/transaction.py:165
+#: ../pakfire/cli.py:187
+msgid "Check the system for any errors."
+msgstr ""
+
+#: ../pakfire/cli.py:247 ../pakfire/transaction.py:165
 msgid "Repository"
 msgstr ""
 
-#: ../pakfire/cli.py:239
+#: ../pakfire/cli.py:247
 msgid "Enabled"
 msgstr ""
 
-#: ../pakfire/cli.py:239
+#: ../pakfire/cli.py:247
 msgid "Priority"
 msgstr ""
 
-#: ../pakfire/cli.py:239
+#: ../pakfire/cli.py:247
 msgid "Packages"
 msgstr ""
 
-#: ../pakfire/cli.py:251
+#: ../pakfire/cli.py:259
 msgid "Cleaning up everything..."
 msgstr ""
 
-#: ../pakfire/cli.py:259
+#: ../pakfire/cli.py:270
 msgid "Pakfire builder command line interface."
 msgstr ""
 
-#: ../pakfire/cli.py:309
+#: ../pakfire/cli.py:320
 msgid "Update the package indexes."
 msgstr ""
 
-#: ../pakfire/cli.py:315
+#: ../pakfire/cli.py:326
 msgid "Build one or more packages."
 msgstr ""
 
-#: ../pakfire/cli.py:317
+#: ../pakfire/cli.py:328
 msgid "Give name of at least one package to build."
 msgstr ""
 
-#: ../pakfire/cli.py:321
+#: ../pakfire/cli.py:332
 msgid "Build the package for the given architecture."
 msgstr ""
 
-#: ../pakfire/cli.py:323 ../pakfire/cli.py:349
+#: ../pakfire/cli.py:334 ../pakfire/cli.py:360
 msgid "Path were the output files should be copied to."
 msgstr ""
 
-#: ../pakfire/cli.py:325 ../pakfire/cli.py:338
+#: ../pakfire/cli.py:336 ../pakfire/cli.py:349
 msgid "Mode to run in. Is either 'release' or 'development' (default)."
 msgstr ""
 
-#: ../pakfire/cli.py:330
+#: ../pakfire/cli.py:341
 msgid "Go into a shell."
 msgstr ""
 
-#: ../pakfire/cli.py:332
+#: ../pakfire/cli.py:343
 msgid "Give name of a package."
 msgstr ""
 
-#: ../pakfire/cli.py:336
+#: ../pakfire/cli.py:347
 msgid "Emulated architecture in the shell."
 msgstr ""
 
-#: ../pakfire/cli.py:343
+#: ../pakfire/cli.py:354
 msgid "Generate a source package."
 msgstr ""
 
-#: ../pakfire/cli.py:345
+#: ../pakfire/cli.py:356
 msgid "Give name(s) of a package(s)."
 msgstr ""
 
-#: ../pakfire/cli.py:421
+#: ../pakfire/cli.py:432
 msgid "Pakfire repo command line interface."
 msgstr ""
 
-#: ../pakfire/cli.py:446
+#: ../pakfire/cli.py:457
 msgid "Repository management commands."
 msgstr ""
 
-#: ../pakfire/cli.py:454
+#: ../pakfire/cli.py:465
 msgid "Create a new repository index."
 msgstr ""
 
-#: ../pakfire/cli.py:455
+#: ../pakfire/cli.py:466
 msgid "Path to the packages."
 msgstr ""
 
-#: ../pakfire/cli.py:456
+#: ../pakfire/cli.py:467
 msgid "Path to input packages."
 msgstr ""
 
-#: ../pakfire/cli.py:468
+#: ../pakfire/cli.py:479
 msgid "Pakfire master command line interface."
 msgstr ""
 
-#: ../pakfire/cli.py:496
+#: ../pakfire/cli.py:507
 msgid "Update the sources."
 msgstr ""
 
-#: ../pakfire/cli.py:506
+#: ../pakfire/cli.py:517
 msgid "Pakfire server command line interface."
 msgstr ""
 
-#: ../pakfire/cli.py:538
+#: ../pakfire/cli.py:549
 msgid "Request a build job from the server."
 msgstr ""
 
-#: ../pakfire/cli.py:544
+#: ../pakfire/cli.py:555
 msgid "Send a keepalive to the server."
 msgstr ""
 
-#: ../pakfire/cli.py:551
+#: ../pakfire/cli.py:562
 msgid "Update all repositories."
 msgstr ""
 
@@ -364,33 +372,33 @@ msgstr ""
 msgid "Loading installed packages"
 msgstr ""
 
-#: ../pakfire/satsolver.py:113
+#: ../pakfire/satsolver.py:114
 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:129
+#: ../pakfire/satsolver.py:130
 msgid "Do you want to manually alter the request?"
 msgstr ""
 
-#: ../pakfire/satsolver.py:132
+#: ../pakfire/satsolver.py:133
 msgid "You can now try to satisfy the solver by modifying your request."
 msgstr ""
 
-#: ../pakfire/satsolver.py:137
+#: ../pakfire/satsolver.py:138
 msgid "Which problem to you want to resolve?"
 msgstr ""
 
-#: ../pakfire/satsolver.py:139
+#: ../pakfire/satsolver.py:140
 msgid "Press enter to try to re-solve the request."
 msgstr ""
 
-#: ../pakfire/satsolver.py:170
+#: ../pakfire/satsolver.py:171
 #, python-format
 msgid "    Solution: %s"
 msgstr ""
 
-#: ../pakfire/satsolver.py:179
+#: ../pakfire/satsolver.py:180
 msgid "    Solutions:"
 msgstr ""
 

diff --git a/src/_pakfiremodule.c b/src/_pakfiremodule.c
index d3f65b2fbbb1caeaebed6f7f5318c564a861729f..16370497413a1056444fbfb82beca18b98d53399 100644 (file)
--- a/src/_pakfiremodule.c
+++ b/src/_pakfiremodule.c
@@ -119,6 +119,8 @@ static PyMethodDef Solution_methods[] = {
 
 static PyMethodDef Solver_methods[] = {
        {"solve", (PyCFunction)Solver_solve, METH_VARARGS, NULL},
+       {"get_fix_system", (PyCFunction)Solver_get_fix_system, METH_NOARGS, NULL},
+       {"set_fix_system", (PyCFunction)Solver_set_fix_system, METH_VARARGS, NULL},
        {"get_allow_downgrade", (PyCFunction)Solver_get_allow_downgrade, METH_NOARGS, NULL},
        {"set_allow_downgrade", (PyCFunction)Solver_set_allow_downgrade, METH_VARARGS, NULL},
        {"get_allow_archchange", (PyCFunction)Solver_get_allow_archchange, METH_NOARGS, NULL},

diff --git a/src/solver.c b/src/solver.c
index 625b57cd445b643aa982e046d30fd2cc8230473b..7962d2ff4edaa62d6984e0bac4f66b16a9745694 100644 (file)
--- a/src/solver.c
+++ b/src/solver.c
@@ -44,6 +44,22 @@ PyObject *Solver_dealloc(SolverObject *self) {
        Py_RETURN_NONE;
 }
 
+PyObject *Solver_get_fix_system(SolverObject *self, PyObject *args) {
+       return Py_BuildValue("i", self->_solver->fixsystem);
+}
+
+PyObject *Solver_set_fix_system(SolverObject *self, PyObject *args) {
+       int val;
+
+       if (!PyArg_ParseTuple(args, "i", &val)) {
+               /* XXX raise exception */
+       }
+
+       self->_solver->fixsystem = val;
+
+       Py_RETURN_NONE;
+}
+
 PyObject *Solver_get_allow_downgrade(SolverObject *self, PyObject *args) {
        return Py_BuildValue("i", self->_solver->allowdowngrade);
 }

diff --git a/src/solver.h b/src/solver.h
index e831d0a96842c6f927abd0fc6f6c03a4a8b0c026..38d9aba7a8e62c9db400ad75e459e0a2824ec61f 100644 (file)
--- a/src/solver.h
+++ b/src/solver.h
@@ -15,6 +15,8 @@ typedef struct {
 extern PyObject* Solver_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
 extern PyObject *Solver_dealloc(SolverObject *self);
 
+extern PyObject *Solver_get_fix_system(SolverObject *self, PyObject *args);
+extern PyObject *Solver_set_fix_system(SolverObject *self, PyObject *args);
 extern PyObject *Solver_get_allow_downgrade(SolverObject *self, PyObject *args);
 extern PyObject *Solver_set_allow_downgrade(SolverObject *self, PyObject *args);
 extern PyObject *Solver_get_allow_archchange(SolverObject *self, PyObject *args);