diff options
| author | Mrau Hu <mrauhu@yandex.ru> | 2022-11-12 18:44:42 +0000 |
|---|---|---|
| committer | Mrau Hu <mrauhu@yandex.ru> | 2022-11-12 18:44:42 +0000 |
| commit | d671d1d45dfab61292ed788fd7778a33a82212ee (patch) | |
| tree | 8a0648afa1824446843d3c0adc53da678795eb20 /modules/ui_extensions.py | |
| parent | 98947d173e3f1667eba29c904f681047dea9de90 (diff) | |
| download | stable-diffusion-webui-gfx803-d671d1d45dfab61292ed788fd7778a33a82212ee.tar.gz stable-diffusion-webui-gfx803-d671d1d45dfab61292ed788fd7778a33a82212ee.tar.bz2 stable-diffusion-webui-gfx803-d671d1d45dfab61292ed788fd7778a33a82212ee.zip | |
Fix: `error: Your local changes to the following files would be overwritten by merge` when run `pull()` method,
because WSL2 Docker set 755 file permissions instead of 644, this results to the error.
Updated `Extension` class: replaced `pull()` with `fetch_and_reset_hard()` method.
Updated `apply_and_restart()` function: replaced `ext.pull()` with `ext.fetch_and_reset_hard()` function.
Diffstat (limited to 'modules/ui_extensions.py')
| -rw-r--r-- | modules/ui_extensions.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py index 6671cb60..030f011e 100644 --- a/modules/ui_extensions.py +++ b/modules/ui_extensions.py @@ -36,9 +36,9 @@ def apply_and_restart(disable_list, update_list): continue
try:
- ext.pull()
+ ext.fetch_and_reset_hard()
except Exception:
- print(f"Error pulling updates for {ext.name}:", file=sys.stderr)
+ print(f"Error getting updates for {ext.name}:", file=sys.stderr)
print(traceback.format_exc(), file=sys.stderr)
shared.opts.disabled_extensions = disabled
|