Skip to content

Commit f51a14a

Browse files
committed
fix(profile): use safe check for config_profile before merge
1 parent 4e72b73 commit f51a14a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

scaleway-core/scaleway_core/profile/profile.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ def from_config_file_and_env(
193193
"""
194194

195195
has_config_profile = False
196+
config_profile = None
196197
try:
197198
config_profile = cls.from_config_file(filepath, profile_name)
198199
has_config_profile = True
@@ -202,7 +203,7 @@ def from_config_file_and_env(
202203
)
203204

204205
env_profile = cls.from_env(force_none=has_config_profile)
205-
if has_config_profile:
206+
if has_config_profile and config_profile is not None:
206207
env_profile.merge(config_profile)
207208

208209
return env_profile

0 commit comments

Comments
 (0)