diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2008-05-30 14:21:45 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2008-06-03 22:39:28 -0400 |
| commit | c90f454dc3f7a5f32c06774516e8099b8b664c63 (patch) | |
| tree | e589cc4707ad883f1c58e524b2bd93f8a621240c /ipa-server/xmlrpc-server/funcs.py | |
| parent | d63df28755a72a3264bc6a99374eee0878551f22 (diff) | |
| download | freeipa-c90f454dc3f7a5f32c06774516e8099b8b664c63.tar.gz freeipa-c90f454dc3f7a5f32c06774516e8099b8b664c63.tar.xz freeipa-c90f454dc3f7a5f32c06774516e8099b8b664c63.zip | |
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.
Diffstat (limited to 'ipa-server/xmlrpc-server/funcs.py')
| -rw-r--r-- | ipa-server/xmlrpc-server/funcs.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipa-server/xmlrpc-server/funcs.py b/ipa-server/xmlrpc-server/funcs.py index 08d351e3..267b0060 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.""" |