From 23ef1eee49f51e6fcae2c1676e9b71b0a9d1436b Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 16 Jan 2018 13:42:10 +0000 Subject: [PATCH] qapi: ensure stable sort ordering when checking QAPI entities MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some early python 3.x versions will have different default ordering when calling the 'values()' method on a dict, compared to python 2.x and later 3.x versions. Explicitly sort the items to get a stable ordering. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Daniel P. Berrange Message-Id: <20180116134217.8725-8-berrange@redhat.com> Signed-off-by: Eduardo Habkost (cherry picked from commit f7a5376d4b667cf6c83c1d640e32d22456d7b5ee) [BR: BSC#1077564] Signed-off-by: Bruce Rogers --- scripts/qapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 88e854edec..94d52f7eb5 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1687,7 +1687,7 @@ class QAPISchema(object): assert False def check(self): - for ent in self._entity_dict.values(): + for (name, ent) in sorted(self._entity_dict.items()): ent.check(self) def visit(self, visitor):