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:11 -0400 |
| commit | c58b7a3d7c32147fd8e72de4254bb35191fedc4b (patch) | |
| tree | 05da08528749094618691cd4f1d36e89e753c594 /ipa-server/xmlrpc-server | |
| parent | 5a56b7c885dc2cdf057c022ad0b4357fcdba5388 (diff) | |
| download | freeipa-c58b7a3d7c32147fd8e72de4254bb35191fedc4b.tar.gz freeipa-c58b7a3d7c32147fd8e72de4254bb35191fedc4b.tar.xz freeipa-c58b7a3d7c32147fd8e72de4254bb35191fedc4b.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')
| -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 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.""" |