devel/yum yum-showasdep.patch, NONE, 1.1 sources, 1.61, 1.62 yum.spec, 1.175, 1.176

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24632

Modified Files:
	sources yum.spec 
Added Files:
	yum-showasdep.patch 
Log Message:
* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 3.2.4-4
- test patch for only packages which are not being otherwise updated to not 
  be shown as being updated for deps


yum-showasdep.patch:

--- NEW FILE yum-showasdep.patch ---
diff --git a/yum/depsolve.py b/yum/depsolve.py
index 4075116..672f960 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -374,6 +374,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
                 
@@ -549,6 +550,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)
@@ -628,6 +630,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 3ed67c5..46e1afb 100644
--- a/yum/transactioninfo.py
+++ b/yum/transactioninfo.py
@@ -226,10 +226,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)


Index: sources
===================================================================
RCS file: /cvs/pkgs/devel/yum/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	28 Aug 2007 22:43:46 -0000	1.61
+++ sources	5 Sep 2007 21:03:16 -0000	1.62
@@ -1,2 +1 @@
-89cf296107d580655aaf83fb7206edfc  yum-3.2.3.tar.gz
 f88b40b3d4429e1a05a2e7f319f096c8  yum-3.2.4.tar.gz


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/devel/yum/yum.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- yum.spec	29 Aug 2007 16:10:24 -0000	1.175
+++ yum.spec	5 Sep 2007 21:03:16 -0000	1.176
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@
 Patch0: installonlyn-enable.patch
 Patch1: version-None-tuple.patch
 Patch2: rpmdb-unresolved.patch
+Patch3: yum-showasdep.patch
 
 URL: http://linux.duke.edu/yum/
 BuildArch: noarch
@@ -50,6 +51,7 @@
 %patch0 -p0 -b .installonly
 %patch1 -p1 -b .ver-to-none
 %patch2 -p1 -b .unresolved
+%patch3 -p1 -b .showdep
 
 %build
 make
@@ -95,6 +97,10 @@
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Wed Sep  5 2007 Jeremy Katz <katzj at redhat.com> - 3.2.4-4
+- test patch for only packages which are not being otherwise updated to not 
+  be shown as being updated for deps
+
 * Wed Aug 29 2007 Seth Vidal <skvidal at fedoraproject.org> 3.2.4-3
 - patch from git-HEAD - unresolved deps