[yum-cvs] yum/yum packages.py,1.81,1.82

James Bowes jbowes at linux.duke.edu
Sat Dec 9 01:34:14 UTC 2006


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

Modified Files:
	packages.py 
Log Message:
Make pkgtup a property, rather than setting it during init

Index: packages.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packages.py,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- packages.py	5 Dec 2006 00:40:51 -0000	1.81
+++ packages.py	9 Dec 2006 01:34:12 -0000	1.82
@@ -48,8 +48,7 @@
        """
     pkgdict = {}
     for pkg in pkgs:
-        pkgtup = (pkg.name, pkg.arch, pkg.epoch, pkg.version, pkg.release)
-        (n, a, e, v, r) = pkgtup
+        (n, a, e, v, r) = pkg.pkgtup
         name = n
         nameArch = '%s.%s' % (n, a)
         nameVerRelArch = '%s-%s-%s.%s' % (n, v, r, a)
@@ -163,7 +162,9 @@
 
     def _pkgtup(self):
         return (self.name, self.arch, self.epoch, self.version, self.release)
-        
+    
+    pkgtup = property(_pkgtup)
+
     def returnChecksums(self):
         return self._checksums
 
@@ -393,7 +394,6 @@
             self.importFromDict(pkgdict)
             self.ver = self.version
             self.rel = self.release
-            self.pkgtup = self._pkgtup()
 
 
     def printVer(self):
@@ -591,7 +591,6 @@
         self.release = self.hdr['release']
         self.ver = self.version
         self.rel = self.release
-        self.pkgtup = self._pkgtup()
         self.summary = self.hdr['summary']
         self.description = self.hdr['description']
         self.pkgid = self.hdr[rpm.RPMTAG_SHA1HEADER]




More information about the Yum-cvs-commits mailing list