Make sure .treeinfo file is sorted

OrderedDict used by default by ConfigParser isn't enough because order
of entries being added may not be deterministic (depends on directory
list order). To solve this problem, use SortedDict as a base.

Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>

pungi.spec

@@ -21,6 +21,7 @@ BuildRequires:  python2-libcomps
 BuildRequires:  python2-six
 BuildRequires:  python2-multilib
 BuildRequires:  python2-dogpile-cache
+BuildRequires:  python2-dict-sorted
 
 Requires:       createrepo >= 0.4.11
 Requires:       yum => 3.4.3-28
@@ -51,6 +52,7 @@ Requires:       python2-multilib
 Requires:       python2-libcomps
 Requires:       python2-six
 Requires:       python2-dogpile-cache
+Requires:       python2-dict-sorted
 
 BuildArch:      noarch
 

pungi/gather.py

@@ -26,6 +26,7 @@ import urlgrabber.progress
 import subprocess
 import createrepo
 import ConfigParser
+from sdict import AlphaSortedDict
 from fnmatch import fnmatch
 
 import arch as arch_module
@@ -89,6 +90,10 @@ def is_package(po):
 class MyConfigParser(ConfigParser.ConfigParser):
     """A subclass of ConfigParser which does not lowercase options"""
 
+    def __init__(self, *args, **kwargs):
+        kwargs['dict_type'] = AlphaSortedDict
+        ConfigParser.ConfigParser.__init__(self, *args, **kwargs)
+
     def optionxform(self, optionstr):
         return optionstr
 

setup.py

@@ -63,6 +63,7 @@ setup(
         "productmd",
         "six",
         'dogpile.cache',
+        'dict.sorted',
         ],
     tests_require = [
         "mock",