Order conf items when dumping them (#15356)

* Order confs con dump()

* Update tests

conans/model/conf.py

@@ -347,7 +347,7 @@ def dumps(self):
         """
         Returns a string with the format ``name=conf-value``
         """
-        return "\n".join([v.dumps() for v in reversed(self._values.values())])
+        return "\n".join([v.dumps() for v in sorted(self._values.values(), key=lambda x: x._name)])
 
     def serialize(self):
         """

conans/test/integration/package_id/package_id_and_confs_test.py

@@ -2,12 +2,12 @@
 
 import pytest
 
-from conans.test.utils.tools import TestClient, NO_SETTINGS_PACKAGE_ID
+from conans.test.utils.tools import GenConanfile, TestClient, NO_SETTINGS_PACKAGE_ID
 
 PKG_ID_NO_CONF = "ebec3dc6d7f6b907b3ada0c3d3cdc83613a2b715"
 PKG_ID_1 = "89d32f25195a77f4ae2e77414b870781853bdbc1"
 PKG_ID_2 = "7f9ed92704709f56ecc7b133322479caf3ffd7ad"
-PKG_ID_3 = "45b796ec237c7e2399944e79bee49b56fd022067"
+PKG_ID_3 = "a9f917f3bad3b48b5bceae70214764274ccd6337"
 
 
 @pytest.mark.parametrize("package_id_confs, package_id", [
@@ -98,3 +98,18 @@ class Pkg(ConanFile):
     assert "tools.build:cxxflags" not in client.out
 
 
+@pytest.mark.parametrize("conf,pkgconf", [
+    ("user.foo:value=1\nuser.bar:value=2", "['user.foo:value', 'user.bar:value']"),
+    ("user.foo:value=1\nuser.bar:value=2", "['user.bar:value', 'user.foo:value']"),
+    ("user.bar:value=2\nuser.foo:value=1", "['user.foo:value', 'user.bar:value']"),
+    ("user.bar:value=2\nuser.foo:value=1", "['user.bar:value', 'user.foo:value']"),
+])
+def test_package_id_order(conf, pkgconf):
+    """Ensure the order of the definitions in the conf file does not affect the package_id"""
+    tc = TestClient(light=True)
+    tc.save({"profile": f"[conf]\ntools.info.package_id:confs={pkgconf}\n" +
+                        conf,
+             "conanfile.py": GenConanfile("pkg", "1.0")})
+    tc.run("create . -pr=profile")
+    # They should all have the same pkg id - note that this did not happen before 2.0.17
+    tc.assert_listed_binary({"pkg/1.0": ("43227c40b8725e89d30a9f97c0652629933a3685", "Build")})

conans/test/unittests/model/test_conf.py

@@ -187,8 +187,8 @@ def test_compose_conf_complex():
     c2.loads(text)
     c.update_conf_definition(c2)
     expected_text = textwrap.dedent("""\
-        user.company.cpu:jobs=5
         user.company.build:ccflags=--m otherflag
+        user.company.cpu:jobs=5
         user.company.list:objs=[0, 1, 2, 3, 4, 'mystr', {'a': 1}, 5, 6, {'b': 2}]
         user.company.network:proxies={'url': 'http://api.site.com/apiv2'}
         zlib:user.company.check:shared=!