From: Simon Horman Subject: [patch 2/9] xm: xen-api: Install create.dtd in SHAREDIR Date: Thu, 04 Jun 2009 13:21:17 +1000 Message-ID: <20090604032229.834695545@vergenet.net> References: <20090604032115.934982694@vergenet.net> Return-path: Content-Disposition: inline; filename=xenapi-create.dtd-in-usr-share-xen.patch List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: Masaki Kanno , Dexuan Cui List-Id: xen-devel@lists.xenproject.org * Install create.dtd in SHAREDIR * Use SHAREDIR/create.dtd * import os.path.join into xenapi_create.py, it already seems to be used many times Resolves the following error when using XenAPI: $ xm create hvm.conf Couldn't open resource '/usr/share/xen/create.dtd' at /usr/share/xen/create.dtd:1:0 Cc: Dexuan Cui , Cc: Masaki Kanno Signed-off-by: Simon Horman Index: xen-unstable.hg/tools/python/Makefile =================================================================== --- xen-unstable.hg.orig/tools/python/Makefile 2009-06-03 09:41:34.000000000 +1000 +++ xen-unstable.hg/tools/python/Makefile 2009-06-03 09:56:44.000000000 +1000 @@ -22,6 +22,7 @@ genpath: echo "BINDIR=\"$(BINDIR)\"" >> ${xenpath} echo "LIBEXEC=\"$(LIBEXEC)\"" >> ${xenpath} echo "LIBDIR=\"$(LIBDIR)\"" >> ${xenpath} + echo "SHAREDIR=\"$(SHAREDIR)\"" >> ${xenpath} echo "PRIVATE_BINDIR=\"$(PRIVATE_BINDIR)\"" >> ${xenpath} echo "XEN_CONFIG_DIR=\"$(XEN_CONFIG_DIR)\"" >> ${xenpath} echo "XEN_SCRIPT_DIR=\"$(XEN_SCRIPT_DIR)\"" >> ${xenpath} @@ -70,8 +71,8 @@ install: install-messages install-dtd $(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" --force install-dtd: all - $(INSTALL_DIR) $(DESTDIR)$(DOCDIR) - $(INSTALL_DATA) xen/xm/create.dtd $(DESTDIR)$(DOCDIR) + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) + $(INSTALL_DATA) xen/xm/create.dtd $(DESTDIR)$(SHAREDIR) install-messages: all set -e; if which $(MSGFMT) >/dev/null ; then \ Index: xen-unstable.hg/tools/python/xen/xm/xenapi_create.py =================================================================== --- xen-unstable.hg.orig/tools/python/xen/xm/xenapi_create.py 2009-06-03 09:41:34.000000000 +1000 +++ xen-unstable.hg/tools/python/xen/xm/xenapi_create.py 2009-06-03 10:21:54.000000000 +1000 @@ -26,10 +26,12 @@ from xen.xend.XendAPIConstants import XE XEN_API_ON_CRASH_BEHAVIOUR from xen.xm.opts import OptionError from xen.util import xsconstants +from xen.util.path import SHAREDIR import xen.util.xsm.xsm as security import sys import os +from os.path import join import traceback import re @@ -75,7 +77,7 @@ class xenapi_create: def __init__(self): self.DEFAULT_STORAGE_REPOSITORY = get_default_SR() - self.dtd = "/usr/share/xen/create.dtd" + self.dtd = join(SHAREDIR, "create.dtd") def create(self, filename=None, document=None, skipdtd=False): """ --