diff options
| author | Carlos Zoido <mrgalleta@gmail.com> | 2021-09-20 12:00:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 12:00:42 +0200 |
| commit | f95c81b88c97faec708b576ef5da27e25e20b725 (patch) | |
| tree | a4f90ddd4707c4c82125e661f992b09af7d0115d | |
| parent | 6ad5a2d59dd2dc3ce593856b4e0b2434e9f49dd9 (diff) | |
Fix migration settings comparison (#9615)
* fix migration settings comparison
* add comment
* add new line and literal comparison in test
* remove comment
| -rw-r--r-- | conans/client/conf/__init__.py | 1 | ||||
| -rw-r--r-- | conans/client/migrations.py | 2 | ||||
| -rw-r--r-- | conans/test/integration/test_migrations.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/conans/client/conf/__init__.py b/conans/client/conf/__init__.py index 231da177..d34f4bf7 100644 --- a/conans/client/conf/__init__.py +++ b/conans/client/conf/__init__.py @@ -131,6 +131,7 @@ _t_default_settings_yml = Template(textwrap.dedent(""" cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23] # Deprecated, use compiler.cppstd + """)) diff --git a/conans/client/migrations.py b/conans/client/migrations.py index cc33e9f5..a2b5dc28 100644 --- a/conans/client/migrations.py +++ b/conans/client/migrations.py @@ -47,7 +47,7 @@ class ClientMigrator(Migrator): self.out.warn("Migration: Updating settings.yml") if hasattr(migrations_settings, var_name): version_default_contents = getattr(migrations_settings, var_name) - if version_default_contents != get_default_settings_yml(): + if version_default_contents.splitlines() != get_default_settings_yml().splitlines(): current_settings = load(cache.settings_path) if current_settings != version_default_contents: save_new() diff --git a/conans/test/integration/test_migrations.py b/conans/test/integration/test_migrations.py index e2f12633..ba02ce1e 100644 --- a/conans/test/integration/test_migrations.py +++ b/conans/test/integration/test_migrations.py @@ -32,7 +32,7 @@ class TestMigrations(unittest.TestCase): self.assertTrue(hasattr(migrations_settings, var_name), "Migrations var '{}' not found".format(var_name)) migrations_settings_content = getattr(migrations_settings, var_name) - self.assertListEqual(current_settings.splitlines(), migrations_settings_content.splitlines()) + assert current_settings == migrations_settings_content def test_is_there_var_for_settings_previous_version(self): from conans import __version__ as current_version |