Be more tolerant of non-xml error responses. Make sure roboto-based C…

…LI tools exit with status of 1 if an error is encountered.

boto/exception.py

@@ -89,8 +89,9 @@ def __init__(self, status, reason, body=None, *args):
                 # Go ahead and clean up anything that may have
                 # managed to get into the error data so we
                 # don't get partial garbage.
-                print "Warning: failed to parse error message from AWS: %s" % pe
                 self._cleanupParsedProperties()
+                self.error_message = self.body
+                self.status = ''
 
     def __getattr__(self, name):
         if name == 'message':

boto/roboto/awsqueryrequest.py

@@ -436,6 +436,10 @@ def do_cli(self):
             sys.exit(1)
         except self.ServiceClass.ResponseError, err:
             print 'Error(%s): %s' % (err.error_code, err.error_message)
+            sys.exit(1)
+        except:
+            print 'Unexpected error.  Use --debugger option for more info.'
+            sys.exit(1)
 
     def _generic_cli_formatter(self, fmt, data, label=''):
         if fmt['type'] == 'object':