[yum-cvs] yum/yum depsolve.py, 1.93, 1.94 packageSack.py, 1.9, 1.10 packages.py, 1.55, 1.56

[Seth Vidal]

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

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

depsolve.py:
 - get rid of the last call using nevra tuples

packageSack.py:
 - kill nevra tuples and dumb print mechanisms

packages.py:
 - remove unused methods


Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- depsolve.py	23 Aug 2006 11:59:56 -0000	1.93
+++ depsolve.py	25 Aug 2006 04:51:29 -0000	1.94
@@ -368,19 +368,17 @@
             
             requirementTuple = (needname, flags, needversion)
 
-            CheckDeps, missingdep = self._requiringFromInstalled(requiringPkg.returnNevraTuple(),
+            CheckDeps, missingdep = self._requiringFromInstalled(requiringPkg,
                                                     requirementTuple, errormsgs)
 
 
         return (CheckDeps, missingdep, conflicts, errormsgs)
 
 
-    def _requiringFromInstalled(self, requiringPkg, requirement, errorlist):
+    def _requiringFromInstalled(self, requiringPo, requirement, errorlist):
         """processes the dependency resolution for a dep where the requiring 
            package is installed"""
 
-        # FIXME - should we think about dealing exclusively in package objects?
-        requiringPo = apply(self.rpmdb.searchNevra, requiringPkg)[0]
         (name, arch, epoch, ver, rel) = requiringPo.pkgtup
         
         (needname, needflags, needversion) = requirement

Index: packageSack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packageSack.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- packageSack.py	25 Aug 2006 04:25:10 -0000	1.9
+++ packageSack.py	25 Aug 2006 04:51:29 -0000	1.10
@@ -405,7 +405,7 @@
         """add a pkgobject to the packageSack"""
 
         repoid = obj.returnSimple('repoid')
-        (name, epoch, ver, rel, arch) = obj.returnNevraTuple()
+        (name, arch, epoch, ver, rel) = obj.pkgtup
         
         if self.compatarchs:
             if self.compatarchs.has_key(arch):
@@ -444,7 +444,7 @@
                     for file in obj.returnFileEntries(ftype):
                         self._addToDictAsList(self.filenames, file, obj)
                 self._addToDictAsList(self.pkgsByID, obj.returnSimple('id'), obj)
-                (name, epoch, ver, rel, arch) = obj.returnNevraTuple()
+                (name, arch, epoch, ver, rel) = obj.pkgtup
                 self._addToDictAsList(self.nevra, (name, epoch, ver, rel, arch), obj)
                 self._addToDictAsList(self.nevra, (name, None, None, None, None), obj)
         
@@ -537,7 +537,7 @@
                        
     def printPackages(self):
         for pkg in self.returnPackages():
-            print pkg.returnNevraPrintable()
+            print pkg
 
     def excludeArchs(self, archlist):
         """exclude incompatible arches. archlist is a list of compatible arches"""

Index: packages.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packages.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- packages.py	25 Aug 2006 04:25:10 -0000	1.55
+++ packages.py	25 Aug 2006 04:51:29 -0000	1.56
@@ -119,47 +119,27 @@
         self.checksums = [] # (type, checksum, id(0,1)
         
     def __str__(self):
-        return self.returnNevraPrintable()
+        if self.returnSimple('epoch') == '0':
+            out = '%s - %s-%s.%s' % (self.returnSimple('name'), 
+                                     self.returnSimple('version'),
+                                     self.returnSimple('release'), 
+                                     self.returnSimple('arch'))
+        else:
+            out = '%s - %s:%s-%s.%s' % (self.returnSimple('name'), 
+                                        self.returnSimple('epoch'), 
+                                        self.returnSimple('version'), 
+                                        self.returnSimple('release'), 
+                                        self.returnSimple('arch'))
+        return out
 
     def returnSimple(self, varname):
         return self.simple[varname]
 
-    def simpleItems(self):
-        return self.simple.keys()            
-
-    def returnID(self):
-        return self.returnSimple('id')
-
-    def returnPackageTuple(self):
+    def _pkgtup(self):
         return (self.returnSimple('name'), self.returnSimple('arch'), 
                 self.returnSimple('epoch'),self.returnSimple('version'), 
                 self.returnSimple('release'))
         
-    def returnNevraTuple(self):
-        return (self.returnSimple('name'), self.returnSimple('epoch'), 
-                self.returnSimple('version'),self.returnSimple('release'), 
-                self.returnSimple('arch'))
-    
-    def returnNevraPrintable(self):
-        """return printable string for the pkgname/object
-           name - epoch:ver-rel.arch"""
-        if self.returnSimple('epoch') == '0':
-            string = '%s - %s-%s.%s' % (self.returnSimple('name'), 
-                                        self.returnSimple('version'),
-                                        self.returnSimple('release'), 
-                                        self.returnSimple('arch'))
-        else:
-            string = '%s - %s:%s-%s.%s' % (self.returnSimple('name'), 
-                                           self.returnSimple('epoch'), 
-                                           self.returnSimple('version'), 
-                                           self.returnSimple('release'), 
-                                           self.returnSimple('arch'))
-        return string                                           
-
-    def returnChangelog(self):
-        """return changelog entries"""
-        return self.changelog
-
 
 class RpmBase:
     """return functions and storage for rpm-specific data"""
@@ -328,8 +308,6 @@
     def size(self):
         return self.returnSimple('packagesize')
 
-    def _pkgtup(self):
-        return self.returnPackageTuple()
 
     def printVer(self):
         """returns a printable version string - including epoch, if it's set"""