From: Jose A. Lopes <jabolopes@google.com>
Date: Thu, 7 Nov 2013 08:56:34 +0000 (+0100)
Subject: Fix reference to vcs version in query server
X-Git-Url: https://code.grnet.gr/git/ganeti-local/commitdiff_plain/3cb9bd3891ee419464772a529174331898a49acc

Fix reference to vcs version in query server

Fix reference to vcs version in query server to take its value from
the Haskell constant in 'Ganeti.Version' instead of using the constant
generated from Python.

Signed-off-by: Jose A. Lopes <jabolopes@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>
---

diff --git a/src/Ganeti/Query/Server.hs b/src/Ganeti/Query/Server.hs
index e28c6aa..20ccc4c 100644
--- a/src/Ganeti/Query/Server.hs
+++ b/src/Ganeti/Query/Server.hs
@@ -59,6 +59,7 @@ import qualified Ganeti.Query.Cluster as QCluster
 import Ganeti.Query.Query
 import Ganeti.Query.Filter (makeSimpleFilter)
 import Ganeti.Types
+import qualified Ganeti.Version as Version
 
 -- | Helper for classic queries.
 handleClassicQuery :: ConfigData      -- ^ Cluster config
@@ -102,7 +103,7 @@ handleCall cdata QueryClusterInfo =
                                  Set.toList . ConstantUtils.unFrozenSet $
                                  C.osApiVersions)
             , ("export_version", showJSON C.exportVersion)
-            , ("vcs_version", showJSON C.vcsVersion)
+            , ("vcs_version", showJSON Version.version)
             , ("architecture", showJSON arch_tuple)
             , ("name", showJSON $ clusterClusterName cluster)
             , ("master", showJSON (case master of