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.

4 files changed, 4 insertions, 30 deletions

diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install
index efee04b50..c3243e13e 100644
--- a/ipa-server/ipa-install/ipa-server-install
+++ b/ipa-server/ipa-install/ipa-server-install
@@ -44,7 +44,7 @@ import ipaserver.httpinstance
 import ipaserver.ntpinstance
 
 from ipaserver import service
-from ipaserver import version
+from ipa import version
 from ipaserver.installutils import *
 
 from ipa import sysrestore
diff --git a/ipa-server/ipaserver/Makefile.am b/ipa-server/ipaserver/Makefile.am
index e124f6b8c..13029e14f 100644
--- a/ipa-server/ipaserver/Makefile.am
+++ b/ipa-server/ipaserver/Makefile.am
@@ -13,7 +13,6 @@ app_PYTHON = 			\
 	installutils.py		\
 	replication.py		\
 	certs.py		\
-	version.py		\
 	$(NULL)
 
 EXTRA_DIST =			\
diff --git a/ipa-server/ipaserver/version.py.in b/ipa-server/ipaserver/version.py.in
deleted file mode 100644
index b0b53f44f..000000000
--- a/ipa-server/ipaserver/version.py.in
+++ /dev/null
@@ -1,25 +0,0 @@
-# Authors: Rob Crittenden <rcritten@redhat.com>
-#
-# Copyright (C) 2007  Red Hat
-# see file 'COPYING' for use and warranty information
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; version 2 only
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-
-# The full version including strings
-VERSION="__VERSION__"
-
-# Just the numeric portion of the version so one can do direct numeric
-# comparisons to see if the API is compatible.
-NUM_VERSION="__NUM_VERSION__"
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."""