diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-08-05 07:52:29 +0300 |
|---|---|---|
| committer | AUTOMATIC1111 <16777216c@gmail.com> | 2023-08-05 07:52:29 +0300 |
| commit | 22ecb78b51f7e6f0234cbc0efbde4ee9a2dc466f (patch) | |
| tree | 69e3bf4d53f4113f192116c252a2e410bb5b1f90 /modules/extensions.py | |
| parent | 390bffa81b747a7eb38ac7a0cd6dfb9fcc388151 (diff) | |
| parent | 0ae2767ae6bb775de448b0d8cda1806edb2aef67 (diff) | |
Merge branch 'dev' into multiple_loaded_models
Diffstat (limited to 'modules/extensions.py')
| -rw-r--r-- | modules/extensions.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/modules/extensions.py b/modules/extensions.py index 3ad5ed53..e4633af4 100644 --- a/modules/extensions.py +++ b/modules/extensions.py @@ -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]
@@ -141,8 +141,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 ***")
|