rf: one more

datalad · Jun 17, 2024 · 0989dfc · 0989dfc
1 parent e363ac5
commit 0989dfc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/datalad_next/credman/manager.py b/datalad_next/credman/manager.py
@@ -30,7 +30,7 @@
 from datalad_next.config import ConfigManager
 from datalad_next.exceptions import (
     CapturedException,
-    CommandError,
+    CoreCommandError,
 )
 from datalad_next.uis import ui_switcher as ui
 
@@ -864,11 +864,11 @@ def _unset_credprops_anyscope(self, name, keys):
                 continue
             try:
                 self._cfg.unset(var, scope='global', reload=False)
-            except CommandError as e:
+            except CoreCommandError as e:
                 CapturedException(e)
                 try:
                     self._cfg.unset(var, scope='local', reload=False)
-                except CommandError as e:
+                except CoreCommandError as e:
                     CapturedException(e)
                     nonremoved_vars.append(var)
         if nonremoved_vars:

diff --git a/datalad_next/url_operations/ssh.py b/datalad_next/url_operations/ssh.py
@@ -28,7 +28,7 @@
 
 from datalad_next.consts import COPY_BUFSIZE
 from datalad_next.config import ConfigManager
-from datalad_next.exceptions import CommandError
+from datalad_next.exceptions import SaladCommandError
 from datalad_next.itertools import align_pattern
 from datalad_next.runners import iter_subproc
 
@@ -106,7 +106,7 @@ def stat(self,
                     # command should signal the error via a non-zero exit code.
                     # That will trigger a `CommandError` below.
                     pass
-        except CommandError:
+        except SaladCommandError:
             self._check_return_code(stream.returncode, url)
         return {k: v for k, v in props.items() if not k.startswith('_')}
 
@@ -216,7 +216,7 @@ def download(self,
                     # command should signal the error via a non-zero exit code.
                     # That will trigger a `CommandError` below.
                     pass
-        except CommandError:
+        except SaladCommandError:
             self._check_return_code(stream.returncode, from_url)
         finally:
             if dst_fp and to_path is not None:
@@ -322,7 +322,7 @@ def _perform_upload(self,
 
                 upload_queue.put(None, timeout=timeout)
 
-        except CommandError as e:
+        except SaladCommandError as e:
             self._check_return_code(e.returncode, to_url)
         except Full:
             if chunk != b'':