[Xen-changelog] This patch adds a check to make sure the config file passed to

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 1a5861311b04698744fb426c18a0af48bbdad4c7
# Parent  d9d88dd713ba8f95c2fe717be36c64c31605913b
This patch adds a check to make sure the config file passed to
vnet-create is correct.  This is better than throwing IOError, because
IOError's are currently reported as xend communication failures.
Also, fix the IOError handling at the end of the file so we don't get
a stack dump if that path is taken.

Signed-off-by: Dan Smith <danms@xxxxxxxxxx>

diff -r d9d88dd713ba -r 1a5861311b04 tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py       Fri Nov  4 10:05:10 2005
+++ b/tools/python/xen/xm/main.py       Fri Nov  4 10:06:41 2005
@@ -666,6 +666,10 @@
 def xm_vnet_create(args):
     arg_check(args, 1, "vnet-create")
     conf = args[0]
+    if not os.access(conf, os.R_OK):
+        print "File not found: %s" % conf
+        sys.exit(1)
+
     from xen.xend.XendClient import server
     server.xend_vnet_create(conf)
 
@@ -800,7 +804,7 @@
         except KeyboardInterrupt:
             print "Interrupted."
             sys.exit(1)
-        except IOError:
+        except IOError, ex:
             if os.geteuid() != 0:
                 err("Most commands need root access.  Please try again as 
root.")
             else:

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