Garden-o-matic: Fix rebaseline-json results handling

Tools/Scripts/webkitpy/tool/servers/gardeningserver.py

 # Copyright (C) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 # 1.  Redistributions of source code must retain the above copyright
 #     notice, this list of conditions and the following disclaimer.
 # 2.  Redistributions in binary form must reproduce the above copyright
 #     notice, this list of conditions and the following disclaimer in the
@@ skipping 94 matching lines @@
             command.extend(['--results-directory', self.server.options.results_directory])
         if not self.server.options.optimize:
             command.append('--no-optimize')
         if self.server.options.verbose:
             command.append('--verbose')
         json_input = self.read_entity_body()
 
         _log.debug("calling %s, input='%s'", command, json_input)
         return_code, output, error = self._run_webkit_patch(command, json_input)
         print >> sys.stderr, error
+        json_result = {"return_code": return_code}
         if return_code:
             _log.error("rebaseline-json failed: %d, output='%s'" % (return_code, output))
+            json_result["output"] = output
         else:
             _log.debug("rebaseline-json succeeded")
 
-        # FIXME: propagate error and/or log messages back to the UI.
-        self._serve_text('success')
+        self._serve_text(json.dumps(json_result))
 
     def localresult(self):
         path = self.query['path'][0]
         filesystem = self.server.tool.filesystem
 
         # Ensure that we're only serving files from inside the results directory.
         if not filesystem.isabs(path) and self.server.options.results_directory:
             fullpath = filesystem.abspath(filesystem.join(self.server.options.results_directory, path))
             if fullpath.startswith(filesystem.abspath(self.server.options.results_directory)):
                 self._serve_file(fullpath, headers_only=(self.command == 'HEAD'))
                 return
 
         self.send_response(403)