From: Michael Tremer Date: Mon, 3 Dec 2012 09:48:11 +0000 (+0100) Subject: solver: Always allow archchange. X-Git-Tag: 0.9.24~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=532142c6c24ea699e9a3aa3f099475fea497974e;p=pakfire.git solver: Always allow archchange. --- diff --git a/python/pakfire/base.py b/python/pakfire/base.py index d4f555fb1..d1a5b4816 100644 --- a/python/pakfire/base.py +++ b/python/pakfire/base.py @@ -387,7 +387,7 @@ class Pakfire(object): # Run the transaction. t.run(logger=logger) - def downgrade(self, pkgs, allow_vendorchange=False, allow_archchange=False, logger=None): + def downgrade(self, pkgs, logger=None, **kwargs): assert pkgs if logger is None: @@ -419,11 +419,7 @@ class Pakfire(object): request.install(rel) # Solve the request. - solver = self.pool.solve(request, - allow_downgrade=True, - allow_vendorchange=allow_vendorchange, - allow_archchange=allow_archchange, - ) + solver = self.pool.solve(request, allow_downgrade=True, **kwargs) assert solver.status is True # Create the transaction. diff --git a/python/pakfire/builder.py b/python/pakfire/builder.py index 23776bd58..16cef3840 100644 --- a/python/pakfire/builder.py +++ b/python/pakfire/builder.py @@ -789,8 +789,7 @@ class BuildEnviron(object): self.log.info(_("Running installation test...")) # Install all packages that were built. - self.install(self.find_result_packages(), - allow_vendorchange=True, allow_archchange=True, + self.install(self.find_result_packages(), allow_vendorchange=True, allow_uninstall=True, signatures_mode="disabled") self.log.info(_("Installation test succeeded.")) diff --git a/python/pakfire/satsolver.py b/python/pakfire/satsolver.py index 42d9a8c13..e035fc99b 100644 --- a/python/pakfire/satsolver.py +++ b/python/pakfire/satsolver.py @@ -298,6 +298,9 @@ class Solver(object): self.__problems = None self.__transaction = None + # Create some sane settings for the most common use cases. + self.set("allow_archchange", True) + def set(self, option, value): try: flag = self.option2flag[option]