Merge from 5.x: PR #21723

Fixes #21711
spyder-ide · Jan 19, 2024 · 66cfd5e · 66cfd5e
2 parents 31ba45f + 5ae26aa
commit 66cfd5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/spyder/plugins/updatemanager/workers.py b/spyder/plugins/updatemanager/workers.py
@@ -104,7 +104,7 @@ def start(self):
         elif is_anaconda():
             self.channel, channel_url = get_spyder_conda_channel()
 
-            if channel_url is None:
+            if self.channel is None or channel_url is None:
                 return
             elif self.channel == "pypi":
                 url = pypi_url

diff --git a/spyder/utils/conda.py b/spyder/utils/conda.py
@@ -184,7 +184,7 @@ def get_spyder_conda_channel():
     conda = find_conda()
 
     if conda is None:
-        return None
+        return None, None
 
     env = get_conda_env_path(sys.executable)
     cmdstr = ' '.join([conda, 'list', 'spyder', '--json', '--prefix', env])
@@ -194,7 +194,7 @@ def get_spyder_conda_channel():
         out = out.decode()
         out = json.loads(out)
     except Exception:
-        return None
+        return None, None
 
     for package_info in out:
         if package_info["name"] == 'spyder':