extras-buildsys/server PackageJob.py,1.7,1.8

[Daniel Williams (dcbw)]

Author: dcbw

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

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

    * server/PackageJob.py
        - Include log URL in email notifications




Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PackageJob.py	14 Jul 2005 19:12:04 -0000	1.7
+++ PackageJob.py	14 Jul 2005 19:25:22 -0000	1.8
@@ -464,7 +464,8 @@
             self._failed()
         except BuildError, e:
             subj = 'Build Error (Job %s): %s on %s' % (self.uid, self.cvs_tag, self.target)
-            self.email_result(resultstring=e.args, subject=subj)
+            msg = "%s\n\n         Build logs may be found at %s" % (e.args, self._make_log_url())
+            self.email_result(resultstring=msg, subject=subj)
             # Kill remaining jobs on other arches
             self._archjobs_lock.acquire()
             for job in self.archjobs.values():
@@ -541,9 +542,15 @@
         self._set_cur_stage('repodone')
         self.wake()
 
+    def _make_log_url(self, arch=None):
+        return "%s/%s/%s-%s-%s-%s/" % (config_opts['log_url'], self.target, self.uid, self.name, self.ver, self.release)
+
     def _succeeded(self):
         self._set_cur_stage('needsign')
-        resultstring = "%s (%s): Build on target %s succeeded." % (self.uid, self.name, self.target)
+        resultstring = """ %s (%s): Build on target %s succeeded.
+
+     Build logs may be found at %s
+""" % (self.uid, self.name, self.target, self._make_log_url())
         self.email_result(resultstring)
         self.bm.notify_job_done(self)