From 9a52fe9eaae988b2c301716ccaaa7b8405f917c3 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: May 11 2017 12:51:57 +0000
Subject: Sort all sets before dumping them


This will ensure that the output is sorted consistently to increase
human-readability and generation of patch diffs in the future.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

---

diff --git a/modulemd/__init__.py b/modulemd/__init__.py
index ecf2fe0..839604b 100644
--- a/modulemd/__init__.py
+++ b/modulemd/__init__.py
@@ -341,9 +341,9 @@ class ModuleMetadata(object):
         d["summary"] = self.summary
         d["description"] = self.description
         d["license"] = dict()
-        d["license"]["module"] = list(self.module_licenses)
+        d["license"]["module"] = sorted(list(self.module_licenses))
         if self.content_licenses:
-            d["license"]["content"] = list(self.content_licenses)
+            d["license"]["content"] = sorted(list(self.content_licenses))
         if self.buildrequires or self.requires:
             d["dependencies"] = dict()
             if self.buildrequires:
@@ -372,15 +372,15 @@ class ModuleMetadata(object):
                     if profile not in d["profiles"]:
                         d["profiles"][profile] = dict()
                     d["profiles"][profile]["rpms"] = \
-                        list(self.profiles[profile].rpms)
+                        sorted(list(self.profiles[profile].rpms))
         if self.api:
             d["api"] = dict()
             if self.api.rpms:
-                d["api"]["rpms"] = list(self.api.rpms)
+                d["api"]["rpms"] = sorted(list(self.api.rpms))
         if self.filter:
             d["filter"] = dict()
             if self.filter.rpms:
-                d["filter"]["rpms"] = list(self.filter.rpms)
+                d["filter"]["rpms"] = sorted(list(self.filter.rpms))
         if self.buildopts:
             d["buildopts"] = dict()
             if self.buildopts.rpms:
@@ -404,9 +404,9 @@ class ModuleMetadata(object):
                     if p.cache:
                         extra["cache"] = p.cache
                     if p.arches:
-                        extra["arches"] = list(p.arches)
+                        extra["arches"] = sorted(list(p.arches))
                     if p.multilib:
-                        extra["multilib"] = list(p.multilib)
+                        extra["multilib"] = sorted(list(p.multilib))
                     d["components"]["rpms"][p.name] = extra
             if self.components.modules:
                 d["components"]["modules"] = dict()
@@ -423,7 +423,7 @@ class ModuleMetadata(object):
         if self.artifacts:
             d["artifacts"] = dict()
             if self.artifacts.rpms:
-                d["artifacts"]["rpms"] = list(self.artifacts.rpms)
+                d["artifacts"]["rpms"] = sorted(list(self.artifacts.rpms))
         doc["data"] = d
         return doc