Merge branch 'dev' into npu_support

1 files changed, 10 insertions, 6 deletions

diff --git a/modules/extensions.py b/modules/extensions.py
index 1899cd52..04bda297 100644
--- a/modules/extensions.py
+++ b/modules/extensions.py
@@ -32,11 +32,12 @@ class ExtensionMetadata:
         self.config = configparser.ConfigParser()

 

         filepath = os.path.join(path, self.filename)

-        if os.path.isfile(filepath):

-            try:

-                self.config.read(filepath)

-            except Exception:

-                errors.report(f"Error reading {self.filename} for extension {canonical_name}.", exc_info=True)

+        # `self.config.read()` will quietly swallow OSErrors (which FileNotFoundError is),

+        # so no need to check whether the file exists beforehand.

+        try:

+            self.config.read(filepath)

+        except Exception:

+            errors.report(f"Error reading {self.filename} for extension {canonical_name}.", exc_info=True)

 

         self.canonical_name = self.config.get("Extension", "Name", fallback=canonical_name)

         self.canonical_name = canonical_name.lower().strip()

@@ -223,13 +224,16 @@ def list_extensions():
 

     # check for requirements

     for extension in extensions:

+        if not extension.enabled:

+            continue

+

         for req in extension.metadata.requires:

             required_extension = loaded_extensions.get(req)

             if required_extension is None:

                 errors.report(f'Extension "{extension.name}" requires "{req}" which is not installed.', exc_info=False)

                 continue

 

-            if not extension.enabled:

+            if not required_extension.enabled:

                 errors.report(f'Extension "{extension.name}" requires "{required_extension.name}" which is disabled.', exc_info=False)

                 continue