[yum-cvs] yum cli.py,1.170,1.171

[Seth Vidal]

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

Modified Files:
	cli.py 
Log Message:

make exactarch not used
exactarchlist is used, If the pkg name exists in this list then it will not
be allowed to change archs. If it does not exist in this list then it will
be allowed to change archs in an update.


Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- cli.py	24 Mar 2005 08:14:14 -0000	1.170
+++ cli.py	26 Mar 2005 07:54:14 -0000	1.171
@@ -818,7 +818,7 @@
                     matched.extend(mtch)
             
             installable = yum.misc.unique(exactmatch + matched)
-            exactarch = self.conf.exactarch
+            exactarchlist = self.conf.exactarchlist
             
             # we look through each returned possibility and rule out the
             # ones that we obviously can't use
@@ -844,7 +844,7 @@
                         (n2, a2, e2, v2, r2) = instTup
                         rc = compareEVR((e2, v2, r2), (pkg.epoch, pkg.version, pkg.release))
                         if rc < 0: # we're newer - this is an update, pass to them
-                            if exactarch:
+                            if n2 in exactarchlist:
                                 if pkg.arch == a2:
                                     passToUpdate.append(pkg.pkgtup)
                             else:
@@ -1052,7 +1052,7 @@
                 (n2, a2, e2, v2, r2) = installed_pkg.pkgtup
                 rc = compareEVR((e2, v2, r2), (e, v, r))
                 if rc < 0: # we're newer - this is an update, pass to them
-                    if self.conf.exactarch:
+                    if n2 in self.conf.exactarchlist:
                         if a == a2:
                             updatepkgs.append((po, installed_pkg))
                             continue