[yum-cvs] yum/yum depsolve.py,1.94,1.95

[Seth Vidal]

Update of /home/groups/yum/cvs/yum/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv1710/yum

Modified Files:
	depsolve.py 
Log Message:

make conflicts stop tracing back when it gets a pkgobj
closes rhbug #204171



Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- depsolve.py	25 Aug 2006 04:51:29 -0000	1.94
+++ depsolve.py	30 Aug 2006 16:49:18 -0000	1.95
@@ -680,13 +680,13 @@
         
         conflict_packages = self.rpmdb.searchNevra(name=confname)
         if conflict_packages:
-            (confname, confarch, confepoch, confver, confrel) = conflict_packages[0] # take the first one, probably the only one
+            confpkg = conflict_packages[0] # take the first one, probably the only one
                 
 
             # if there's an update for the reqpkg, then update it
             if len(uplist) > 0:
-                if confname not in self.conf.exactarchlist:
-                    pkgs = self.pkgSack.returnNewestByName(confname)
+                if confpkg.name not in self.conf.exactarchlist:
+                    pkgs = self.pkgSack.returnNewestByName(confpkg.name)
                     archs = {}
                     for pkg in pkgs:
                         (n,a,e,v,r) = pkg.pkgtup
@@ -694,7 +694,7 @@
                     a = rpmUtils.arch.getBestArchFromList(archs.keys())
                     po = archs[a]
                 else:
-                    po = self.pkgSack.returnNewestByNameArch((confname,confarch))[0]
+                    po = self.pkgSack.returnNewestByNameArch((confpkg.name,confpkg.arch))[0]
                 if po.pkgtup not in uplist:
                     po = None