[yum-commits] 2 commits - cli.py yum/__init__.py

[James Antill]

 cli.py          |    1 -
 yum/__init__.py |    2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d2a9c675e75b725617993c33b19ab4c1bb44ba1f
Author: James Antill <james at and.org>
Date:   Mon Sep 17 10:59:42 2012 -0400

     Don't skip loadts new rpmdbv check, when transaction changes. BZ 857961.
    
     This means we can't use load-ts in "yum shell" (without turning this
    check off) but otherwise the entire test is pretty much worthless.

diff --git a/cli.py b/cli.py
index de00b14..cf2c369 100755
--- a/cli.py
+++ b/cli.py
@@ -538,7 +538,6 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
         
         cfr = self.tsInfo._check_future_rpmdbv
         if (cfr is not None and
-            cfr[0] == self.tsInfo.state_counter and
             self.tsInfo.futureRpmDBVersion() != cfr[1]):
             msg = _("future rpmdb ver mismatched saved transaction version,")
             if cfr[2]:
commit 90647379e42599106ca2b726309dcdf7e405dbc5
Author: James Antill <james at and.org>
Date:   Mon Sep 17 10:57:17 2012 -0400

    If ignoremissing is on in load-ts and something is missing, turn ignorenew on.

diff --git a/yum/__init__.py b/yum/__init__.py
index 198dc6d..8dbe5e5 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -6491,6 +6491,7 @@ much more problems).
                     if not ignoremissing:
                         raise Errors.YumBaseError(msg)
                     else:
+                        ignorenewrpm = False
                         self.logger.critical(msg)
                 else:
                     pkgcount += 1
@@ -6567,6 +6568,7 @@ much more problems).
         if pkgprob:
             msg = _("Transaction members, relations are missing or ts has been modified,")
             if ignoremissing:
+                ignorenewrpm = False
                 msg += _(" ignoring, as requested. You must redepsolve!")
                 self.logger.critical(msg)
             else: