Added -v/--version

3 files changed, 28 insertions, 0 deletions

diff --git a/cobbler/api.py b/cobbler/api.py
index a061b68..d520cc9 100644
--- a/cobbler/api.py
+++ b/cobbler/api.py
@@ -23,6 +23,7 @@ import action_import
 import action_reposync
 import action_status
 import action_validate
+import sub_process
 
 class BootAPI:
 
@@ -42,6 +43,19 @@ class BootAPI:
             self.__settings = self._config.settings()
             self.sync_flag = self.__settings.minimize_syncs
 
+    def version(self):
+        """
+        What version is cobbler?
+        Currently checks the RPM DB, which is not perfect.
+        Will return "?" if not installed.
+        """
+        cmd = sub_process.Popen("/bin/rpm -q cobbler", stdout=sub_process.PIPE, shell=True)
+        result = cmd.communicate()[0].replace("cobbler-","")
+        if result.find("not installed") != -1:
+            return "?"
+        return result[:result.rfind(".")]
+
+
     def clear(self):
         """
         Forget about current list of profiles, distros, and systems
@@ -182,4 +196,9 @@ class BootAPI:
         """
         return self._config.deserialize()
 
+if __name__ == "__main__":
+    api = BootAPI()
+    print api.version()
+
+
 
diff --git a/cobbler/cobbler.py b/cobbler/cobbler.py
index 4b0fba6..0a8ae33 100755
--- a/cobbler/cobbler.py
+++ b/cobbler/cobbler.py
@@ -83,6 +83,8 @@ class BootCLI:
             'sync'    :  self.reposync
         }
         self.commands['toplevel'] = {
+            '-v'           : self.version,
+            '--version'    : self.version,
             'check'        : self.check,
             'validateks'   : self.validateks,  
             'list'         : self.list,
@@ -587,6 +589,10 @@ class BootCLI:
         """
         return self.api.validateks()
 
+    def version(self,args):
+        print self.api.version()
+        return True
+
     def check(self,args):
         """
         Check system for network boot decency/prereqs: 'cobbler check'
diff --git a/cobbler/cobblerd.py b/cobbler/cobblerd.py
index 9d8521a..c796567 100644
--- a/cobbler/cobblerd.py
+++ b/cobbler/cobblerd.py
@@ -111,6 +111,9 @@ class CobblerXMLRPCInterface:
         data.sort(self.__sorter)
         return self.fix_none(data)
 
+    def version(self):
+        return self.api.version()
+
     def get_distros(self):
         return self.__get_all(self.api.distros())