Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update message on create_settings when settings are constrained #7930

Merged
merged 2 commits into from Oct 23, 2020
Merged

update message on create_settings when settings are constrained #7930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb02eeb
update message on create_settings when settings are constrained
sdmg15 Oct 23, 2020
6f58a6c
fix: failing test in test_cppstd.py
sdmg15 Oct 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion conans/model/conan_file.py
View file
Open in desktop
Expand Up @@ -69,7 +69,7 @@ def create_settings(conanfile, settings):
settings.constraint(current)
return settings
except Exception as e:
raise ConanInvalidConfiguration("Error while initializing settings. %s" % str(e))
raise ConanInvalidConfiguration("The recipe is contraining settings. %s" % str(e))


@contextmanager
Expand Down
2 changes: 1 addition & 1 deletion conans/test/conan_v2/settings_model/test_cppstd.py
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ class Recipe(ConanFile):
if use_settings_v1:
self.assertIn("Conan v2 incompatible: Setting 'cppstd' is deprecated", t.out)
else:
self.assertIn("ERROR: Error while initializing settings. 'settings.cppstd' doesn't exist", t.out)
self.assertIn("ERROR: The recipe is contraining settings. 'settings.cppstd' doesn't exist", t.out)

@parameterized.expand([(True,), (False,)])
def test_settings_model(self, use_settings_v1):
Expand Down