[Xen-changelog] [xen-unstable] Only import xenapi_create when using the Xen-API server -- this has additional

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

# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Date 1174315611 0
# Node ID 126a2c3c6a9d82e772b4d58b501a1acec7a1c407
# Parent  bbda4759791789229d08499e194db8cdb418c4e7
Only import xenapi_create when using the Xen-API server -- this has additional
dependencies that we don't want to require in legacy mode.

Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
---
 tools/python/xen/xm/create.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r bbda47597917 -r 126a2c3c6a9d tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py     Mon Mar 19 14:00:07 2007 +0000
+++ b/tools/python/xen/xm/create.py     Mon Mar 19 14:46:51 2007 +0000
@@ -35,7 +35,6 @@ from xen.util import blkif
 from xen.util import blkif
 from xen.util import security
 from xen.xm.main import serverType, SERVER_XEN_API, get_single_vm
-from xen.xm.xenapi_create import sxp2xml, xenapi_create
 
 from xen.xm.opts import *
 
@@ -1249,6 +1248,7 @@ def main(argv):
             raise OptionError("Cannot read file %s: %s" % (config, exn[1]))
 
     if serverType == SERVER_XEN_API:
+        from xen.xm.xenapi_create import sxp2xml
         sxp2xml_inst = sxp2xml()
         doc = sxp2xml_inst.convert_sxp_to_xml(config, transient=True)
 
@@ -1266,6 +1266,7 @@ def main(argv):
         do_console(sxp.child_value(config, 'name', -1))
     
     if serverType == SERVER_XEN_API:        
+        from xen.xm.xenapi_create import xenapi_create
         xenapi_create_inst = xenapi_create()
         vm_refs = xenapi_create_inst.create(document = doc)
 

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