extras-buildsys/server PackageJob.py,1.44,1.45

[Daniel Williams (dcbw)]

Author: dcbw

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

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

    * server/PackageJob.py
        - (_arch_deps_solved): fix cachedir and logfile paths; turns out yum
            already adds the installroot to these.  Furthermore, return an
            error when we can't find a suitable yum config file for the arch




Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- PackageJob.py	13 Mar 2006 03:45:48 -0000	1.44
+++ PackageJob.py	24 Mar 2006 01:33:31 -0000	1.45
@@ -446,9 +446,9 @@
         job_yum_dir = os.path.join(self._depsolve_dir, arch)
         for line in config_opts['yum.conf'].split('\n'):
             if string.find(line, "cachedir=") >= 0:
-                line = "cachedir=%s" % os.path.join(job_yum_dir, "cache")
+                line = "cachedir=cache"
             elif string.find(line, "logfile=") >= 0:
-                line = "logfile=%s" % os.path.join(job_yum_dir, "yum.log")
+                line = "logfile=yum.log"
             config_lines.append(line+'\n')
         del config_opts
 
@@ -471,7 +471,12 @@
         try:
             base = yum.YumBase()
             yum_config = self._write_yum_conf(arch)
-            base.doConfigSetup(fn=yum_config, root=os.path.dirname(yum_config))
+            if not yum_config:
+                del base
+                raise DepError("WARNING: bad yum config for arch %s." % arch)
+
+            depsolve_root = os.path.dirname(yum_config) + '/'
+            base.doConfigSetup(fn=yum_config, root=depsolve_root)
             threshold = 0
             if DEBUG:
                 threshold = 5
@@ -513,7 +518,10 @@
             print "%s (%s/%s): Depsolve Error: %s" % (self.uid, self.package, arch, str(e))
             success = False
 
-        del base, srpm
+        if base:
+            del base
+        if srpm:
+            del srpm
         return success
 
     def start_depsolve(self, first_try=False):