[yum-cvs] yum/yum packages.py,1.73.2.1,1.73.2.2

[Paul Nasrat]

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

Modified Files:
      Tag: yum-3_0_X
	packages.py 
Log Message:
Fix comparisons using PackageEVR


Index: packages.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packages.py,v
retrieving revision 1.73.2.1
retrieving revision 1.73.2.2
diff -u -r1.73.2.1 -r1.73.2.2
--- packages.py	13 Oct 2006 01:25:02 -0000	1.73.2.1
+++ packages.py	13 Oct 2006 13:08:59 -0000	1.73.2.2
@@ -189,16 +189,8 @@
         self._changelog = [] # (ctime, cname, ctext)
         self.licenses = []
 
-    def __eq__(self, other):
-        if comparePoEVR(self, other) == 0 and self.arch == other.arch:
-            return True
-        return False
-
-    def __ne__(self, other):
-        if comparePoEVR(self, other) != 0 and self.arch != other.arch:
-            return True
-        return False
-       
+    def returnEVR(self):
+        return PackageEVR(self.epoch,self.ver,self.rel)
     
     def __hash__(self):
         mystr = '%s - %s:%s-%s-%s.%s' % (self.repo.id, self.epoch, self.name,
@@ -331,10 +323,10 @@
     
 class PackageEVR:
     
-    def init(self,e,v,r):
+    def __init__(self,e,v,r):
         self.epoch = e
         self.ver = v
-        self.release
+        self.rel = r
         
     def compare(self,other):
         return rpmUtils.miscutils.compareEVR((self.epoch, self.ver, self.rel), (other.epoch, other.ver, other.rel))