This is needed because unless the task is closed, the log files won't be in the packages/ tree, and the email will reference 404 urls. --- builder/kojid | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/builder/kojid b/builder/kojid
index f4b7509..c03af74 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -2118,7 +2118,10 @@ Build Info: %(weburl)s/buildinfo?buildID=%(build_id)i\r
if filetype == 'rpms':
output += " %s\r\n" %
'/'.join([options.pkgurl, build['name'], build['version'], build['release'],
task['build_arch'], file])
elif filetype == 'logs':
- output += " %s\r\n" %
'/'.join([options.pkgurl, build['name'], build['version'], build['release'],
'data', 'logs', task['build_arch'], file])
+ if tasks[task_state] != 'closed':
+ output += "
%s/getfile?taskID=%s&name=%s\r\n" % (weburl, task['id'], file)
+ else:
+ output += " %s\r\n" %
'/'.join([options.pkgurl, build['name'], build['version'], build['release'],
'data', 'logs', task['build_arch'], file])
elif task[filetype] == 'misc':
output += "
%s/getfile?taskID=%s&name=%s\r\n" % (weburl, task['id'], file)
output += "\r\n"
--
1.5.3.8
--
Jesse Keating
Fedora -- All my bits are free, are yours?
From 51e2d69f9eac235bd5dfa4760aa5c2f3f3eec5ba Mon Sep 17 00:00:00 2001
From: Jesse Keating <[EMAIL PROTECTED]>
Date: Sun, 13 Jan 2008 10:46:02 -0500
Subject: [PATCH] Revert to getfile urls if the task is not successful (closed).
This is needed because unless the task is closed, the log files won't
be in the packages/ tree, and the email will reference 404 urls.
---
builder/kojid | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/builder/kojid b/builder/kojid
index f4b7509..c03af74 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -2118,7 +2118,10 @@ Build Info: %(weburl)s/buildinfo?buildID=%(build_id)i\r
if filetype == 'rpms':
output += " %s\r\n" % '/'.join([options.pkgurl, build['name'], build['version'], build['release'], task['build_arch'], file])
elif filetype == 'logs':
- output += " %s\r\n" % '/'.join([options.pkgurl, build['name'], build['version'], build['release'], 'data', 'logs', task['build_arch'], file])
+ if tasks[task_state] != 'closed':
+ output += " %s/getfile?taskID=%s&name=%s\r\n" % (weburl, task['id'], file)
+ else:
+ output += " %s\r\n" % '/'.join([options.pkgurl, build['name'], build['version'], build['release'], 'data', 'logs', task['build_arch'], file])
elif task[filetype] == 'misc':
output += " %s/getfile?taskID=%s&name=%s\r\n" % (weburl, task['id'], file)
output += "\r\n"
--
1.5.3.8
signature.asc
Description: PGP signature
-- Fedora-buildsys-list mailing list Fedora-buildsys-list@redhat.com https://www.redhat.com/mailman/listinfo/fedora-buildsys-list
