diff options
| -rw-r--r-- | cobbler/remote.py | 9 | ||||
| -rw-r--r-- | cobbler/webui/CobblerWeb.py | 10 |
2 files changed, 11 insertions, 8 deletions
diff --git a/cobbler/remote.py b/cobbler/remote.py index 1b2dad6d..faeb5cb2 100644 --- a/cobbler/remote.py +++ b/cobbler/remote.py @@ -339,11 +339,18 @@ class CobblerXMLRPCInterface: def version(self,token=None,**rest): """ Return the cobbler version for compatibility testing with remote applications. - Returns as a float, 0.6.1-2 should result in (int) "0.612". + See api.py for documentation. """ self._log("version",token=token) return self.api.version() + def extended_version(self,token=None,**rest): + """ + Returns the full dictionary of version information. See api.py for documentation. + """ + self._log("version",token=token) + return self.api.version(extended=True) + def get_distros(self,page=None,results_per_page=None,token=None,**rest): """ Returns all cobbler distros as an array of hashes. diff --git a/cobbler/webui/CobblerWeb.py b/cobbler/webui/CobblerWeb.py index 94bc24ee..30bd1018 100644 --- a/cobbler/webui/CobblerWeb.py +++ b/cobbler/webui/CobblerWeb.py @@ -120,14 +120,10 @@ class CobblerWeb(object): if not self.__xmlrpc_setup(): return self.xmlrpc_auth_failure() - vernum=self.remote.version() - vermajor=math.floor(vernum) - verminor=math.floor((vernum*10)%10) - vermicro=math.floor((vernum*1000)%100) - verstr="%d.%d.%d" % (vermajor, verminor, vermicro) + vdata =self.remote.extended_version() return self.__render( 'index.tmpl', { - 'version': verstr, - }) + 'version': vdata["version"], + }) def menu(self,**args): return self.__render( 'blank.tmpl', { } ) |