[yum-cvs] yum/depsolve.py yum/transactioninfo.py

[Jeremy Katz]

 yum/depsolve.py        |    3 +++
 yum/transactioninfo.py |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3caa21be447fc284bb04429804151c9747ff9ab5
Author: Jeremy Katz <katzj at redhat.com>
Date:   Fri Oct 12 10:11:03 2007 -0400

    fix transaction listing to properly display only deps as deps as opposed to
    some things which are manually done and also deps (rh#283961)

diff --git a/yum/depsolve.py b/yum/depsolve.py
index 3f0f962..b81b1b8 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -375,6 +375,7 @@ class Depsolve(object):
                     if po.pkgtup == new:
                         txmbr = self.tsInfo.addUpdate(po, requiringPo)
                         txmbr.setAsDep(po=needpo)
+                        txmbr.reason = "dep"
                         self.verbose_logger.log(logginglevels.DEBUG_2, 'TSINFO: Updating %s to resolve dep.', po)
                 checkdeps = 1
                 
@@ -550,6 +551,7 @@ class Depsolve(object):
             # FIXME: we should probably handle updating multiple packages...
             txmbr = self.tsInfo.addUpdate(best, inst[0])
             txmbr.setAsDep()
+            txmbr.reason = "dep"
         else:
             self.verbose_logger.debug('TSINFO: Marking %s as install for %s', best,
                 name)
@@ -629,6 +631,7 @@ class Depsolve(object):
                 'TSINFO: Updating %s to resolve conflict.', po)
             txmbr = self.tsInfo.addUpdate(po, confpkg)
             txmbr.setAsDep()
+            txmbr.reason = "dep"
             CheckDeps = 1
             
         else:
diff --git a/yum/transactioninfo.py b/yum/transactioninfo.py
index e2dd550..096a3c0 100644
--- a/yum/transactioninfo.py
+++ b/yum/transactioninfo.py
@@ -228,10 +228,10 @@ class TransactionData:
         self.depremoved = []
         self.depinstalled = []
         self.depupdated = []
-        
+
         for txmbr in self.getMembers():
             if txmbr.output_state == TS_UPDATE:
-                if txmbr.isDep:
+                if txmbr.isDep and txmbr.reason == "dep":
                     self.depupdated.append(txmbr)
                 else:
                     self.updated.append(txmbr)