[yum-cvs] yum/yum __init__.py, 1.102, 1.103 config.py, 1.53, 1.54 depsolve.py, 1.61, 1.62

[Seth Vidal]

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

Modified Files:
	__init__.py config.py depsolve.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: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- __init__.py	25 Mar 2005 09:42:25 -0000	1.102
+++ __init__.py	26 Mar 2005 07:54:15 -0000	1.103
@@ -238,6 +238,7 @@
             self.up.rawobsoletes = self.pkgSack.returnObsoletes()
             
         self.up.exactarch = self.conf.getConfigOption('exactarch')
+        self.up.exactarchlist = self.conf.getConfigOption('exactarchlist')
         self.up.doUpdates()
 
         if self.conf.getConfigOption('obsoletes'):

Index: config.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/config.py,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- config.py	25 Mar 2005 15:13:06 -0000	1.53
+++ config.py	26 Mar 2005 07:54:15 -0000	1.54
@@ -216,6 +216,9 @@
                          ('kernelpkgnames', ['kernel','kernel-smp',
                                              'kernel-enterprise', 'kernel-bigmem',
                                              'kernel-BOOT']),
+                         ('exactarchlist', ['kernel', 'kernel-smp', 'glibc',
+                                            'kernel-hugemem', 'kernel-enterprise',
+                                            'kernel-bigmem']
                          ('tsflags', [])]
                          
         optionbools = [('assumeyes', 'False'),

Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- depsolve.py	12 Mar 2005 07:24:04 -0000	1.61
+++ depsolve.py	26 Mar 2005 07:54:15 -0000	1.62
@@ -388,11 +388,11 @@
             thismode = self.tsInfo.getMode(name=i_n, arch=i_a, 
                             epoch=i_e, ver=i_v, rel=i_r)
                         
-            if thismode is None and self.conf.exactarch:
+            if thismode is None and i_n in self.conf.exactarchlist:
                 # check for mode by the same name+arch
                 thismode = self.tsInfo.getMode(name=i_n, arch=i_a)
             
-            if thismode is None and not self.conf.exactarch:
+            if thismode is None and i_n not in self.conf.exactarchlist:
                 # check for mode by just the name
                 thismode = self.tsInfo.getMode(name=i_n)
             
@@ -444,7 +444,7 @@
             
             po = None
             if len(uplist) > 0:
-                if not self.conf.exactarch:
+                if name not in self.conf.exactarchlist:
                     pkgs = self.pkgSack.returnNewestByName(name)
                     archs = []
                     for pkg in pkgs:
@@ -650,7 +650,7 @@
 
             # if there's an update for the reqpkg, then update it
             if len(uplist) > 0:
-                if not self.conf.exactarch:
+                if confname not in self.conf.exactarchlist:
                     pkgs = self.pkgSack.returnNewestByName(confname)
                     archs = []
                     for pkg in pkgs: