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

Rename conan.cfg to global.conf #8422

Merged
merged 1 commit into from
Feb 1, 2021
Merged

Rename conan.cfg to global.conf #8422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conans/client/cache/cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,11 @@ def config(self):

@property
def new_config_path(self):
return os.path.join(self.cache_folder, "conan.cfg")
return os.path.join(self.cache_folder, "global.conf")

@property
def new_config(self):
""" this is the new conan.cfgto replace the old conan.conf that contains
""" this is the new global.conf to replace the old conan.conf that contains
configuration defined with the new syntax as in profiles, this config will be composed
to the profile ones and passed to the conanfiles.conf, which can be passed to collaborators
"""
Expand Down
2 changes: 1 addition & 1 deletion conans/model/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def update_conf_definition(self, other):

def rebase_conf_definition(self, other):
"""
for taking the new conan.cfg and composing with the profile [conf]
for taking the new global.conf and composing with the profile [conf]
:type other: ConfDefinition
"""
for k, v in other._pattern_confs.items():
Expand Down