From mboxrd@z Thu Jan  1 00:00:00 1970
From: Yu Zhiguo <yuzg@cn.fujitsu.com>
Subject: xm: catch TypeError if xenconsole is nonexistent
Date: Wed, 28 Apr 2010 18:32:43 +0800
Message-ID: <4BD80ECB.5050301@cn.fujitsu.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Keir Fraser <keir.fraser@eu.citrix.com>
Cc: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

If command xenconsole is nonexistent:
# xm console pv1
Unexpected error: exceptions.TypeError

Please report to xen-devel@lists.xensource.com
Traceback (most recent call last):
  File "/usr/sbin/xm", line 7, in ?
    main.main(sys.argv)
  File "usr/lib64/python2.4/site-packages/xen/xm/main.py", line 3939, in main
...

Catch this error.
------------

catch TypeError if xenconsole is nonexistent

Signed-off-by: Yu Zhiguo <yuzg@cn.fujitsu.com>

diff -r c87ec146229a -r b696c19ee132 tools/python/xen/util/auxbin.py
--- a/tools/python/xen/util/auxbin.py	Fri Apr 23 15:04:26 2010 +0100
+++ b/tools/python/xen/util/auxbin.py	Thu Apr 29 01:48:00 2010 +0800
@@ -28,7 +28,7 @@
         a.extend(args)
     try:
         os.execv(exepath, a)
-    except OSError, exn:
+    except (OSError, TypeError), exn:
         print exepath, ": ", exn
         sys.exit(1)