From 9d2b32307e7b21f4a79312c3a929c93977453abf Mon Sep 17 00:00:00 2001 From: czoido Date: Mon, 1 Feb 2021 16:26:20 +0100 Subject: [PATCH] rename conan.cfg to global.conf --- conans/client/cache/cache.py | 4 ++-- conans/model/conf.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conans/client/cache/cache.py b/conans/client/cache/cache.py index d6bc12f955a..33c55cdf155 100644 --- a/conans/client/cache/cache.py +++ b/conans/client/cache/cache.py @@ -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 """ diff --git a/conans/model/conf.py b/conans/model/conf.py index 4aa17bf0bd8..24143bb021e 100644 --- a/conans/model/conf.py +++ b/conans/model/conf.py @@ -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():