From 6ae1fade7b76e9e1d10e33be22c55db8034580a3 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Tue, 26 Jul 2011 18:34:46 +0200
Subject: [PATCH] Fix OS queries for API v20 w/parameters
OS parameters is a list of tuples, so we can't pass it directly to
utils.NiceSort, hence we use a sort key.
This was not detected in QA since QA only tests API v10 :(
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/query.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/query.py b/lib/query.py
index 4c847743b..5d491444a 100644
--- a/lib/query.py
+++ b/lib/query.py
@@ -1955,7 +1955,9 @@ def _BuildOsFields():
None, 0, _ConvWrap(sorted, _GetItemAttr("api_versions"))),
(_MakeField("parameters", "Parameters", QFT_OTHER,
"Operating system parameters"),
- None, 0, _ConvWrap(utils.NiceSort, _GetItemAttr("parameters"))),
+ None, 0, _ConvWrap(compat.partial(utils.NiceSort,
+ key=operator.itemgetter(0)),
+ _GetItemAttr("parameters"))),
(_MakeField("node_status", "NodeStatus", QFT_OTHER,
"Status from node"),
None, 0, _GetItemAttr("node_status")),
--
GitLab