Преглед изворни кода

Ignore NotADirectoryError for optional config files

Fixes #1234
Unrud пре 3 година
родитељ
комит
c14defcba8
1 измењених фајлова са 2 додато и 2 уклоњено
  1. 2 2
      radicale/config.py

+ 2 - 2
radicale/config.py

@@ -283,8 +283,8 @@ def load(paths: Optional[Iterable[Tuple[str, bool]]] = None
                 config = {s: {o: parser[s][o] for o in parser.options(s)}
                 config = {s: {o: parser[s][o] for o in parser.options(s)}
                           for s in parser.sections()}
                           for s in parser.sections()}
         except Exception as e:
         except Exception as e:
-            if not (ignore_if_missing and
-                    isinstance(e, (FileNotFoundError, PermissionError))):
+            if not (ignore_if_missing and isinstance(e, (
+                    FileNotFoundError, NotADirectoryError, PermissionError))):
                 raise RuntimeError("Failed to load %s: %s" % (config_source, e)
                 raise RuntimeError("Failed to load %s: %s" % (config_source, e)
                                    ) from e
                                    ) from e
             config = Configuration.SOURCE_MISSING
             config = Configuration.SOURCE_MISSING