diff options
| author | w-e-w <40751091+w-e-w@users.noreply.github.com> | 2023-08-08 02:39:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-08 02:39:34 +0000 |
| commit | f17c8c2eff63210f5e96e1e2b049b46ba9cfa389 (patch) | |
| tree | 701056aec9ae11bc45df9b39b176a54fa4d34e19 /modules/extensions.py | |
| parent | c75bda867be5345bf959daf23bdc19eadc90841a (diff) | |
| parent | 01997f45ba089af24b03a5f614147bb0f9d8d824 (diff) | |
| download | stable-diffusion-webui-gfx803-f17c8c2eff63210f5e96e1e2b049b46ba9cfa389.tar.gz stable-diffusion-webui-gfx803-f17c8c2eff63210f5e96e1e2b049b46ba9cfa389.tar.bz2 stable-diffusion-webui-gfx803-f17c8c2eff63210f5e96e1e2b049b46ba9cfa389.zip | |
Merge branch 'dev' into auro-autolaunch
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 ***")
|