Merge pull request #8647 from Tps-F/add_submodule

Support git submodule for extension and Fix Windows PermissionError

1 files changed, 5 insertions, 8 deletions

diff --git a/modules/ui_extensions.py b/modules/ui_extensions.py
index 50173e68..4a502974 100644
--- a/modules/ui_extensions.py
+++ b/modules/ui_extensions.py
@@ -1,6 +1,5 @@
 import json

 import os.path

-import shutil

 import sys

 import time

 import traceback

@@ -141,22 +140,20 @@ def install_extension_from_url(dirname, url):
 

     try:

         shutil.rmtree(tmpdir, True)

-

-        repo = git.Repo.clone_from(url, tmpdir)

-        repo.remote().fetch()

-

+        with git.Repo.clone_from(url, tmpdir) as repo:

+            repo.remote().fetch()

+            for submodule in repo.submodules:

+                submodule.update()

         try:

             os.rename(tmpdir, target_dir)

         except OSError as err:

-            # TODO what does this do on windows? I think it'll be a different error code but I don't have a system to check it

-            # Shouldn't cause any new issues at least but we probably want to handle it there too.

             if err.errno == errno.EXDEV:

                 # Cross device link, typical in docker or when tmp/ and extensions/ are on different file systems

                 # Since we can't use a rename, do the slower but more versitile shutil.move()

                 shutil.move(tmpdir, target_dir)

             else:

                 # Something else, not enough free space, permissions, etc.  rethrow it so that it gets handled.

-                raise(err)

+                raise err

 

         import launch

         launch.run_extension_installer(target_dir)