Merge branch 'AUTOMATIC1111:master' into master

1 files changed, 8 insertions, 6 deletions

diff --git a/modules/extensions.py b/modules/extensions.py
index 3ad5ed53..bf9a1878 100644
--- a/modules/extensions.py
+++ b/modules/extensions.py
@@ -1,7 +1,7 @@
 import os

 import threading

 

-from modules import shared, errors, cache

+from modules import shared, errors, cache, scripts

 from modules.gitpython_hack import Repo

 from modules.paths_internal import extensions_dir, extensions_builtin_dir, script_path  # noqa: F401

 

@@ -11,9 +11,9 @@ os.makedirs(extensions_dir, exist_ok=True)
 

 

 def active():

-    if shared.opts.disable_all_extensions == "all":

+    if shared.cmd_opts.disable_all_extensions or shared.opts.disable_all_extensions == "all":

         return []

-    elif shared.opts.disable_all_extensions == "extra":

+    elif shared.cmd_opts.disable_extra_extensions or shared.opts.disable_all_extensions == "extra":

         return [x for x in extensions if x.enabled and x.is_builtin]

     else:

         return [x for x in extensions if x.enabled]

@@ -90,8 +90,6 @@ class Extension:
         self.have_info_from_repo = True

 

     def list_files(self, subdir, extension):

-        from modules import scripts

-

         dirpath = os.path.join(self.path, subdir)

         if not os.path.isdir(dirpath):

             return []

@@ -141,8 +139,12 @@ def list_extensions():
     if not os.path.isdir(extensions_dir):

         return

 

-    if shared.opts.disable_all_extensions == "all":

+    if shared.cmd_opts.disable_all_extensions:

+        print("*** \"--disable-all-extensions\" arg was used, will not load any extensions ***")

+    elif shared.opts.disable_all_extensions == "all":

         print("*** \"Disable all extensions\" option was set, will not load any extensions ***")

+    elif shared.cmd_opts.disable_extra_extensions:

+        print("*** \"--disable-extra-extensions\" arg was used, will only load built-in extensions ***")

     elif shared.opts.disable_all_extensions == "extra":

         print("*** \"Disable all extensions\" option was set, will only load built-in extensions ***")