extras-buildsys/server PackageJob.py,1.3,1.4

[Daniel Williams (dcbw)]

Author: dcbw

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

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

    * server/PackageJob.py
        - Make some prep error emails more informative




Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PackageJob.py	7 Jul 2005 17:15:09 -0000	1.3
+++ PackageJob.py	7 Jul 2005 18:17:51 -0000	1.4
@@ -185,46 +185,46 @@
         exclusive = hdr['exclusivearch'] 
         exclude = hdr['excludearch']
         
-        arches = {}
+        build_arches = {}
 
         if ba == ['noarch']:
-            arches['noarch'] = None
-            return arches
+            build_arches['noarch'] = None
+            return (build_arches, None, None)
 
         # default to building all base arches the 'target'
         # supports, and any additional arches from the
         # Additional Package Arches file whose "master" arch
         # is enabled for this target
-        tmparchs = []
+        pkg_arches = []
         allowed_arches = []
         for arch in buildable_arches:
-            tmparchs.append(arch)
+            pkg_arches.append(arch)
             allowed_arches.append(arch)
         for arch in addl_arches:
-            tmparchs.append(arch)
+            pkg_arches.append(arch)
             allowed_arches.append(arch)
         # Optional arches don't get built by default but are "allowed"
         for arch in opt_arches:
             allowed_arches.append(arch)
 
         if ba:
-            tmparchs = ba
+            pkg_arches = ba
         else:
             if exclusive:
-                tmparchs = exclusive
+                pkg_arches = exclusive
                 
         if exclude:
             for arch in exclude:
-                if arch in tmparchs:
-                    tmparchs.remove(arch)
+                if arch in pkg_arches:
+                    pkg_arches.remove(arch)
 
         # we probably need to check the archs, and make sure they are what 
         # we can build for
-        for thisarch in tmparchs:
+        for thisarch in pkg_arches:
             if thisarch in allowed_arches:
-                arches[thisarch] = None
+                build_arches[thisarch] = None
 
-        return arches
+        return (build_arches, pkg_arches, allowed_arches)
 
 
     def _make_stage_dir(self, rootdir):
@@ -307,12 +307,15 @@
         self.name = hdr['name']
         self.ver = hdr['version']
         self.release = hdr['release']
-        self.archjobs = self.arch_handling(hdr)
+        (self.archjobs, pkg_arches, allowed_arches) = self.arch_handling(hdr)
         del hdr
         del ts
 
         if len(self.archjobs) == 0:
-            msg = "Package %s does not build on any architectures this build system supports.\n" % self.cvs_tag
+            msg = """Package %s does not build on any architectures this build system supports.
+    Package: %s
+    Build System: %s
+""" % (self.cvs_tag, pkg_arches, allowed_arches)
             raise PrepError(msg)
 
         self.stage_dir = self._make_stage_dir(config_opts['server_work_dir'])