From c58b7a3d7c32147fd8e72de4254bb35191fedc4b Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Fri, 30 May 2008 14:21:45 -0400 Subject: Move version.py to the common ipa directory instead of being server-based so it can be used by the client tool. Fix the client tool imports to fail more gracefully. --- ipa-server/xmlrpc-server/funcs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ipa-server/xmlrpc-server') diff --git a/ipa-server/xmlrpc-server/funcs.py b/ipa-server/xmlrpc-server/funcs.py index 08d351e37..267b00604 100644 --- a/ipa-server/xmlrpc-server/funcs.py +++ b/ipa-server/xmlrpc-server/funcs.py @@ -26,7 +26,7 @@ import ipaserver.dsinstance import ipaserver.ipaldap import copy from ipaserver import attrs -from ipaserver import version +from ipa import version from ipa import ipaerror from ipa import ipautil from urllib import quote,unquote @@ -386,8 +386,8 @@ class IPAServer: # Higher-level API def version(self, opts=None): """The version of IPA""" - logging.debug("IPA: version %d" % ipaserver.version.NUM_VERSION) - return ipaserver.version.NUM_VERSION + logging.debug("IPA: version %d" % version.NUM_VERSION) + return version.NUM_VERSION def get_aci_entry(self, sattrs, opts=None): """Returns the entry containing access control ACIs.""" -- cgit