[Xen-changelog] [xen-3.0.3-testing] [XM] Reenable the '-h' option, disabled in changeset:11572.

["Xen patchbot-3.0.3-testing" <patchbot-3.0.3-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1159361926 -3600
# Node ID 79a4a00c4e15226019fe0901f1dcad0d35b81140
# Parent  7c5ea4f50bd957744a1f95a738c14b8de65ad21c
[XM] Reenable the '-h' option, disabled in changeset:11572.
Signed-off-by: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
---
 tools/python/xen/xm/main.py |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff -r 7c5ea4f50bd9 -r 79a4a00c4e15 tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py       Wed Sep 27 13:54:04 2006 +0100
+++ b/tools/python/xen/xm/main.py       Wed Sep 27 13:58:46 2006 +0100
@@ -1423,13 +1423,14 @@ def main(argv=sys.argv):
     if len(argv) < 2:
         usage()
 
-    # intercept --help and output our own help
-    if '--help' in argv[1:]:
-        if '--help' == argv[1]:
-            longHelp()
-        else:
-            usage(argv[1])
-        sys.exit(0)
+    # intercept --help(-h) and output our own help
+    for help in ['--help', '-h']:
+        if help in argv[1:]:
+            if help == argv[1]:
+                longHelp()
+            else:
+                usage(argv[1])
+            sys.exit(0)
 
     cmd = xm_lookup_cmd(argv[1])
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog