Giant webui patch take 2

1 files changed, 3 insertions, 2 deletions

diff --git a/ipalib/plugins/misc.py b/ipalib/plugins/misc.py
index 2dcc6554c..8bf9d81fd 100644
--- a/ipalib/plugins/misc.py
+++ b/ipalib/plugins/misc.py
@@ -45,20 +45,21 @@ class env(LocalOrRemote):
                         keys.add(key)
             elif query in self.env:
                 keys.add(query)
-        return sorted(keys)
+        return keys
 
     def execute(self, variables, **options):
         if variables is None:
             keys = self.env
         else:
             keys = self.__find_keys(variables)
-        return tuple(
+        return dict(
             (key, self.env[key]) for key in keys
         )
 
     def output_for_cli(self, textui, result, variables, **options):
         if len(result) == 0:
             return
+        result = tuple((k, result[k]) for k in sorted(result))
         if len(result) == 1:
             textui.print_keyval(result)
             return