extras-buildsys/server PackageJob.py,1.10,1.11

[Daniel Williams (dcbw)]

Author: dcbw

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

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

    * builder/builder.py
      common/ArchUtils.py
      server/PackageJob.py
        - Allow the server and builder to actually build "sub" arches
            like i486/sparcv9/etc, which broke after the the builder
            changes on 2005-07-16




Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PackageJob.py	18 Jul 2005 19:07:48 -0000	1.10
+++ PackageJob.py	18 Jul 2005 21:26:30 -0000	1.11
@@ -1,4 +1,4 @@
-    # This program is free software; you can redistribute it and/or modify
+# This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
@@ -34,6 +34,7 @@
 import socket
 import BuilderManager
 import ArchJob
+from plague import ArchUtils
 
 # Load in the config
 execfile("/etc/plague/server/CONFIG.py")
@@ -147,23 +148,6 @@
         return self.uid
         
     def arch_handling(self, hdr):
-        # Associate sub-architectures with their "master" architecture.
-        # This is only used to determine which arches to build on by default,
-        # so that if we have an Additional Package Arches file that specifies
-        # 'sparcv9' for a package that we don't try to build sparcv9 for that
-        # package unless 'sparc' is listed in our 'targets' config option.
-        sub_arches = {
-                        'athlon'    : 'i386',
-                        'i686'      : 'i386',
-                        'i586'      : 'i386',
-                        'i486'      : 'i386',
-                        'amd64'     : 'x86_64',
-                        'ia32e'     : 'x86_64',
-                        'ppc32'     : 'ppc',
-                        'sparcv8'   : 'sparc',
-                        'sparcv9'   : 'sparc'
-                     }
-
         # Grab additional build arches out of the Additional Package
         # Arches file
         apa_file_name = self.target + "addl-arches"
@@ -195,8 +179,12 @@
 
         # Remove arches we don't support from addl_arches
         for arch in addl_arches:
-            if sub_arches.has_key(arch):
-                master_addl_arch = sub_arches[arch]
+            # arch_utils is only used to determine which arches to build on by default,
+            # so that if we have an Additional Package Arches file that specifies
+            # 'sparcv9' for a package that we don't try to build sparcv9 for that
+            # package unless 'sparc' is also listed in our 'targets' config option.
+            if ArchUtils.sub_arches.has_key(arch):
+                master_addl_arch = ArchUtils.sub_arches[arch]
                 if master_addl_arch not in buildable_arches:
                     if master_addl_arch not in opt_arches:
                         addl_arches.remove(arch)