Merge branch 'master' into cors-regex

1 files changed, 5 insertions, 2 deletions

diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index 02ab9643..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

@@ -134,6 +134,9 @@ def install_extension_from_url(dirname, url):
 

         os.rename(tmpdir, target_dir)

 

+        import launch

+        launch.run_extension_installer(target_dir)

+

         extensions.list_extensions()

         return [extension_table(), html.escape(f"Installed into {target_dir}. Use Installed tab to restart.")]

     finally: