[yum-cvs] yum/yum packages.py,1.36,1.37

[Panu Matilainen]

Update of /home/groups/yum/cvs/yum/yum
In directory login:/tmp/cvs-serv20257/yum

Modified Files:
	packages.py 
Log Message:
Add support for name-epoch:version-release.arch naming convention to 
parsePackages()


Index: packages.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packages.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- packages.py	13 Mar 2005 09:24:28 -0000	1.36
+++ packages.py	21 Jun 2005 18:25:04 -0000	1.37
@@ -40,6 +40,7 @@
        dict[name-1] = (name, i386, 0, 1, 1)       
        dict[name-1-1] = (name, i386, 0, 1, 1)
        dict[0:name-1-1.i386] = (name, i386, 0, 1, 1)
+       dict[name-0:1-1.i386] = (name, i386, 0, 1, 1)
        """
     pkgdict = {}
     for pkg in pkgs:
@@ -50,8 +51,9 @@
         nameVerRelArch = '%s-%s-%s.%s' % (n, v, r, a)
         nameVer = '%s-%s' % (n, v)
         nameVerRel = '%s-%s-%s' % (n, v, r)
-        full = '%s:%s-%s-%s.%s' % (e, n, v, r, a)
-        for item in [name, nameArch, nameVerRelArch, nameVer, nameVerRel, full]:
+        envra = '%s:%s-%s-%s.%s' % (e, n, v, r, a)
+        nevra = '%s-%s:%s-%s.%s' % (n, e, v, r, a)
+        for item in [name, nameArch, nameVerRelArch, nameVer, nameVerRel, envra, nevra]:
             if not pkgdict.has_key(item):
                 pkgdict[item] = []
             pkgdict[item].append(pkg)