[oe-commits] org.oe.dev oestats-client.bbclass: don't include bug number/tracker if empty

[jeremy_laine commit]

oestats-client.bbclass: don't include bug number/tracker if empty

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: 59f6f4c68e5988f38904304419f82ebc82248093
ViewMTN: http://monotone.openembedded.org/revision/info/59f6f4c68e5988f38904304419f82ebc82248093
Files:
1
classes/oestats-client.bbclass
Diffs:

#
# mt diff -r6c2b4a6ba3e0fb35262baf7cd1a11bce577539ca -r59f6f4c68e5988f38904304419f82ebc82248093
#
#
#
# patch "classes/oestats-client.bbclass"
#  from [9b7bcf75099c4710192e9db3d5d93b228b0c73ba]
#    to [589563f5373f1a4448a5ea5dd3915a3010a96e46]
#
============================================================
--- classes/oestats-client.bbclass	9b7bcf75099c4710192e9db3d5d93b228b0c73ba
+++ classes/oestats-client.bbclass	589563f5373f1a4448a5ea5dd3915a3010a96e46
@@ -118,7 +118,7 @@ def oestats_task(server, d, task, status
 	except:
 		elapsed = 0
 	
-	# send the log for failures
+	# prepare files
 	files = {}
 	if status == 'Failed':
 		logs = glob.glob("%s/log.%s.*" % (bb.data.getVar('T', d, True), task))
@@ -130,20 +130,25 @@ def oestats_task(server, d, task, status
 				'content': file(log).read(),
 				'content-type': 'text/plain'}
 	
+	# prepare report
+	vars = {
+		'build': id,
+		'package': bb.data.getVar('PN', d, True),
+		'version': bb.data.getVar('PV', d, True),
+		'revision': bb.data.getVar('PR', d, True),
+		'depends': bb.data.getVar('DEPENDS', d, True),
+		'task': task,
+		'status': status,
+		'time': str(elapsed)}
+	bug_number = bb.data.getVar('OESTATS_BUG_NUMBER', d, True)
+	bug_tracker = bb.data.getVar('OESTATS_BUG_TRACKER', d, True)
+	if bug_number and bug_tracker:
+		vars['bug_number'] = bug_number
+		vars['bug_tracker'] = bug_tracker
+
 	# send report
 	try:
-		response = oestats_send(server, "/tasks/", {
-			'build': id,
-			'package': bb.data.getVar('PN', d, True),
-			'version': bb.data.getVar('PV', d, True),
-			'revision': bb.data.getVar('PR', d, True),
-			'depends': bb.data.getVar('DEPENDS', d, True),
-			'task': task,
-			'status': status,
-			'time': str(elapsed),
-			'bug_number': bb.data.getVar('OESTATS_BUG_NUMBER', d, True) or "",
-			'bug_tracker': bb.data.getVar('OESTATS_BUG_TRACKER', d, True) or "",
-		}, files)
+		response = oestats_send(server, "/tasks/", vars, files)
 	except:
 		bb.note("oestats: error sending task, disabling stats")
 		oestats_setid(d, "")