[yum-commits] Branch 'yum-3_2_X' - 2 commits - yum/__init__.py yum/yumRepo.py

[James Antill]

 yum/__init__.py |    4 ++++
 yum/yumRepo.py  |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit f5677410fcd76a1d0023c5846546a4b408f65000
Author: Zdeněk Pavlas <zpavlas at redhat.com>
Date:   Thu Aug 18 16:31:54 2011 +0200

    NoMoreMirrorsRepoError is a RepoError

diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index 11fbf0a..91b7dde 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -1033,7 +1033,7 @@ Insufficient space in download directory %s
             if grab_can_fail:
                 return None
             raise Errors.RepoError, 'Error downloading file %s: %s' % (local, e)
-        except (Errors.NoMoreMirrorsRepoError, Errors.RepoError):
+        except Errors.RepoError:
             misc.unlink_f(tfname)
             if grab_can_fail:
                 return None
@@ -1627,7 +1627,7 @@ Insufficient space in download directory %s
                                   text=text,
                                   cache=self.http_caching == 'all',
                                   size=thisdata.size)
-        except (Errors.NoMoreMirrorsRepoError, Errors.RepoError):
+        except Errors.RepoError:
             if retrieve_can_fail:
                 return None
             raise
commit 00fcc59b5092982cac1d86b30f3717038ccc8831
Author: James Antill <james at and.org>
Date:   Thu Aug 18 09:51:36 2011 -0400

    Set _depsolving_failed as soon as buildTransaction is run. BZ 731717

diff --git a/yum/__init__.py b/yum/__init__.py
index 3c83684..5bbf079 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1041,6 +1041,10 @@ class YumBase(depsolve.Depsolve):
         :param unfinished_transactions_check: whether to check for
            unfinished transactions before building the new transaction
         """
+        # FIXME: This is horrible, see below and yummain. Maybe create a real
+        #        rescode object? :(
+        self._depsolving_failed = False
+
         if (unfinished_transactions_check and
             misc.find_unfinished_transactions(yumlibpath=self.conf.persistdir)):
             msg = _('There are unfinished transactions remaining. You might ' \