#38 Sort all sets before dumping them
Merged 6 years ago by psabata. Opened 6 years ago by sgallagh.
sgallagh/modulemd master  into  master

file modified
+8 -8
@@ -341,9 +341,9 @@ 

          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 @@ 

                      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 @@ 

                      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 @@ 

          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

  

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

+1, although we should also sort the dicts, to be sure. Had to do that in tests before.

Pull-Request has been merged by psabata

6 years ago
Metadata