extras-buildsys/server PackageJob.py,1.53,1.54

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2904/server

Modified Files:
	PackageJob.py 
Log Message:
2006-07-22  Dan Williams  <dcbw at redhat.com>

    * server/PackageJob.py
        - Fix yum configfile creation during depsolve for non-base
        	architectures (reported by Joe Todaro <jstodaro at us.ibm.com>)




Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- PackageJob.py	19 Jul 2006 13:57:45 -0000	1.53
+++ PackageJob.py	22 Jul 2006 15:07:12 -0000	1.54
@@ -454,7 +454,11 @@
         try:
             mock_config = self._target_cfg.mock_config_for_arch(arch)
         except KeyError:
-            return None
+            # Try again with the base architecture for the build architecture
+            try:
+                mock_config = self._target_cfg.mock_config_for_arch(ArchUtils.sub_arches[arch])
+            except KeyError:
+                return None
 
         config_opts = {}
         execfile(mock_config)
@@ -488,7 +492,8 @@
             base = yum.YumBase()
             yum_config = self._write_yum_conf(arch)
             if not yum_config:
-                raise DepError("WARNING: bad yum config for arch %s." % arch)
+                raise DepError("""WARNING: could not create yum config for arch %s.
+A mock config file for this arch is likely missing.""" % arch)
 
             depsolve_root = os.path.dirname(yum_config) + '/'
             base.doConfigSetup(fn=yum_config, root=depsolve_root)