[yum-cvs] yum/rpmUtils updates.py,1.19,1.20

[Seth Vidal]

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

Modified Files:
	updates.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: updates.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/rpmUtils/updates.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- updates.py	12 Mar 2005 20:10:07 -0000	1.19
+++ updates.py	26 Mar 2005 16:38:43 -0000	1.20
@@ -33,6 +33,9 @@
         self.available = availlist # list of available pkgs (n, a, e, v, r)
         self.rawobsoletes = {} # dict of obsoleting package->[what it obsoletes]
         self.exactarch = 1 # don't change archs by default
+        self.exactarchlist = ['kernel', 'kernel-smp', 'glibc', 'kernel-hugemem',
+                              'kernel-enterprise', 'kernel-bigmem', 'kernel-BOOT']
+                              
         self.myarch = rpmUtils.arch.getCanonArch() # this is for debugging only 
                                                    # set this if you want to 
                                                    # test on some other arch
@@ -283,7 +286,7 @@
         # simple cases
         for (n, a) in simpleupdate:
             # try to be as precise as possible
-            if self.exactarch:
+            if n in self.exactarchlist:
                 if self.installdict.has_key((n, a)):
                     (rpm_e, rpm_v, rpm_r) = self.returnNewest(self.installdict[(n, a)])
                     if newpkgs.has_key((n,a)):
@@ -354,7 +357,7 @@
                 hipdict = self.makeNADict(highestinstalledpkgs, 0)
 
                 # now we have the two sets of pkgs
-                if self.exactarch:              
+                if n in self.exactarchlist:
                     for (n, a) in hipdict:
                         if hapdict.has_key((n, a)):
                             self.debugprint('processing %s.%s' % (n, a))