[yum-cvs] yum/yum packageSack.py,1.10,1.11 packages.py,1.58,1.59

[Seth Vidal]

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

Modified Files:
	packageSack.py packages.py 
Log Message:

fix up some issues with overlapping methods


Index: packageSack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packageSack.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- packageSack.py	25 Aug 2006 04:51:29 -0000	1.10
+++ packageSack.py	25 Aug 2006 06:45:20 -0000	1.11
@@ -494,7 +494,7 @@
             else:
                 pkg2 = highdict[(pkg.name, pkg.arch)]
                 if pkg > pkg2:
-                    highdict[(n, a)] = pkg
+                    highdict[(pkg.name, pkg.arch)] = pkg
         
         if naTup:
             if highdict.has_key(naTup):

Index: packages.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packages.py,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- packages.py	25 Aug 2006 06:22:02 -0000	1.58
+++ packages.py	25 Aug 2006 06:45:20 -0000	1.59
@@ -305,8 +305,6 @@
             self.rel = self.returnSimple('release')
             self.arch = self.returnSimple('arch')
             self.pkgtup = self._pkgtup()
-            self.remote_path = self.returnSimple('relativepath')
-            self.size =  self.returnSimple('packagesize')
 
 
     def printVer(self):
@@ -339,6 +337,16 @@
     obsoletes = property(_obsoletes)
     conflicts = property(_conflicts)
     
+    def _size(self):
+        return self.returnSimple('packagesize')
+    
+    def _remote_path(self):
+        return self.returnSimple('relativepath')
+    
+    size = property(_size)
+    remote_path = property(_remote_path)
+    
+    
     
     def returnLocalHeader(self):
         """returns an rpm header object from the package object's local