merge of '0e517dabcd24598274e65b9a372217fa56ffe66a'

     and '560eb1fe854306a1781ae17f1c30c0271e110cfd'

2 files changed, 22 insertions, 11 deletions

diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass
index b86562890a..b256365175 100644
--- a/classes/gtk-icon-cache.bbclass
+++ b/classes/gtk-icon-cache.bbclass
@@ -3,14 +3,18 @@ RDEPENDS += "hicolor-icon-theme"
 
 # This could run on the host as icon cache files are architecture independent,
 # but there is no gtk-update-icon-cache built natively.
-gtk-icon-cache_postinst() {
+gtk_icon_cache_postinst() {
 if [ "x$D" != "x" ]; then
         exit 1
 fi
+
+# Update the pixbuf loaders in case they haven't been registered yet
+gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+
 gtk-update-icon-cache -q /usr/share/icons/hicolor
 }
 
-gtk-icon-cache_postrm() {
+gtk_icon_cache_postrm() {
 gtk-update-icon-cache -q /usr/share/icons/hicolor
 }
 
@@ -29,13 +33,13 @@ python populate_packages_append () {
 		postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
 		if not postinst:
 			postinst = '#!/bin/sh\n'
-		postinst += bb.data.getVar('gtk-icon-cache_postinst', d, 1)
+		postinst += bb.data.getVar('gtk_icon_cache_postinst', d, 1)
 		bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
 
 		postrm = bb.data.getVar('pkg_postrm_%s' % pkg, d, 1) or bb.data.getVar('pkg_postrm', d, 1)
 		if not postrm:
 			postrm = '#!/bin/sh\n'
-		postrm += bb.data.getVar('gtk-icon-cache_postrm', d, 1)
+		postrm += bb.data.getVar('gtk_icon_cache_postrm', d, 1)
 		bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d)
 }
 
diff --git a/classes/oestats-client.bbclass b/classes/oestats-client.bbclass
index 69c708c151..c05ede481f 100644
--- a/classes/oestats-client.bbclass
+++ b/classes/oestats-client.bbclass
@@ -5,7 +5,7 @@
 # To make use of this class, add to your local.conf:
 #
 # INHERIT += "oestats-client"
-# OESTATS_SERVER = "some.server.org:8000"
+# OESTATS_SERVER = "some.server.org"
 # OESTATS_BUILDER = "some_nickname"
 
 def oestats_setid(d, val):
@@ -44,7 +44,7 @@ def oestats_send(server, action, vars = {}, files = {}):
 
 	# build headers
 	headers = {
-		"User-agent": "oestats-client/0.1",
+		"User-agent": "oestats-client/0.3",
 		"Content-type": "multipart/form-data; boundary=%s" % bound,
 		"Content-length": str(len(body))}
 
@@ -64,7 +64,7 @@ def oestats_start(server, builder, d):
 	# send report
 	id = ""
 	try:
-		data = oestats_send(server, "/builds/start/", {
+		data = oestats_send(server, "/builds/", {
 			'builder': builder,
 			'revision': bb.data.getVar('METADATA_REVISION', d, True),
 			'machine': bb.data.getVar('MACHINE', d, True),
@@ -81,7 +81,7 @@ def oestats_start(server, builder, d):
 		bb.note("oestats: error starting build, disabling stats")
 	oestats_setid(d, id)
 
-def oestats_stop(server, d, status):
+def oestats_stop(server, d, failures):
 	import bb
 
 	# retrieve build id
@@ -89,8 +89,13 @@ def oestats_stop(server, d, status):
 	if not id: return
 
 	# send report
+	if failures > 0:
+		status = "Failed"
+	else:
+		status = "Succeeded"		      
+
 	try:
-		response = oestats_send(server, "/builds/stop/%s/" % id, {
+		response = oestats_send(server, "/builds/%s/" % id, {
 			'status': status,
 		})
 	except:
@@ -125,10 +130,12 @@ def oestats_task(server, d, task, status):
 	
 	# send report
 	try:
-		response = oestats_send(server, "/builds/task/%s/" % id, {
+		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),
@@ -154,7 +161,7 @@ python oestats_eventhandler () {
 	if getName(e) == 'BuildStarted':
 		oestats_start(server, builder, e.data)
 	elif getName(e) == 'BuildCompleted':
-		oestats_stop(server, e.data, 'Completed')
+		oestats_stop(server, e.data, e.getFailures())
 	elif getName(e) == 'TaskStarted':
 		bb.data.setVar('OESTATS_STAMP', repr(time.time()), e.data)
 	elif getName(e) == 'TaskSucceeded':