fix(profile): use safe check for config_profile before merge

Laure-di · Laure-di · commit 624fc8d2918d · 2025-10-08T14:58:44.000+02:00
diff --git a/scaleway-core/scaleway_core/profile/profile.py b/scaleway-core/scaleway_core/profile/profile.py
@@ -202,7 +202,7 @@ def from_config_file_and_env(
             )
 
         env_profile = cls.from_env(force_none=has_config_profile)
-        if has_config_profile:
+        if config_profile is not None:
             env_profile.merge(config_profile)
 
         return env_profile

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ def from_config_file_and_env(`
`202`	`202`	`)`
`203`	`203`
`204`	`204`	`env_profile = cls.from_env(force_none=has_config_profile)`
`205`		`- if has_config_profile:`
	`205`	`+ if config_profile is not None:`
`206`	`206`	`env_profile.merge(config_profile)`
`207`	`207`
`208`	`208`	`return env_profile`