Merge to restore reverted changes.

tools/python/xen/xm/main.py

@@ -32,6 +32,7 @@ import warnings
 warnings.filterwarnings('ignore', category=FutureWarning)
 
 import xen.xend.XendError
+import xen.xend.XendProtocol
 
 from xen.xend import PrettyPrint
 from xen.xend import sxp
@@ -710,6 +711,14 @@ def main(argv=sys.argv):
                 print
                 print "Please report to xen-devel@lists.xensource.com"
                 raise
+        except xen.xend.XendProtocol.XendError, ex:
+            if len(args) > 0:
+                handle_xend_error(argv[1], args[0], ex)
+            else:
+                print "Unexpected error:", sys.exc_info()[0]
+                print
+                print "Please report to xen-devel@lists.xensource.com"
+                raise
         except SystemExit:
             sys.exit(1)
         except: