Allow uninstall of packages on install test.

Sometimes, we introduce obsoletes or conflicts to packages
and in that case, the install test may fail, if it cannot remove
some packages.

diff --git a/pakfire/base.py b/pakfire/base.py
index 813ed979bf1018b2bc9da2f1fe9d302b9819b2ef..3753477cbe3063a30ad159c241fa2b5104537d51 100644 (file)
--- a/pakfire/base.py
+++ b/pakfire/base.py
@@ -240,7 +240,7 @@ class Pakfire(object):
                # Run the transaction.
                t.run()
 
-       def localinstall(self, files, yes=None):
+       def localinstall(self, files, yes=None, allow_uninstall=False):
                repo_name = repo_desc = "localinstall"
 
                # Create a new repository that holds all packages we passed on
@@ -268,7 +268,7 @@ class Pakfire(object):
                                request.install(solv)
 
                        solver = self.create_solver()
-                       t = solver.solve(request)
+                       t = solver.solve(request, uninstall=allow_uninstall)
 
                        # If solving was not possible, we exit here.
                        if not t:

diff --git a/pakfire/builder.py b/pakfire/builder.py
index f0fd37c9923b99098a48d96f96733d7e94ad54c7..2879834ec40fbe93617d194567c0b95c9e677a87 100644 (file)
--- a/pakfire/builder.py
+++ b/pakfire/builder.py
@@ -303,7 +303,7 @@ class BuildEnviron(object):
                        for file in files:
                                pkgs.append(os.path.join(dir, file))
 
-               self.pakfire.localinstall(pkgs, yes=True)
+               self.pakfire.localinstall(pkgs, yes=True, allow_uninstall=True)
 
        def chrootPath(self, *args):
                # Remove all leading slashes