Merge branch 'AUTOMATIC1111:master' into master

1 files changed, 12 insertions, 3 deletions

diff --git a/launch.py b/launch.py
index 1dbc4c6e..f83820d2 100644
--- a/launch.py
+++ b/launch.py
@@ -1,6 +1,5 @@
 from modules import launch_utils

 

-

 args = launch_utils.args

 python = launch_utils.python

 git = launch_utils.git

@@ -26,8 +25,18 @@ start = launch_utils.start
 

 

 def main():

-    if not args.skip_prepare_environment:

-        prepare_environment()

+    if args.dump_sysinfo:

+        filename = launch_utils.dump_sysinfo()

+

+        print(f"Sysinfo saved as {filename}. Exiting...")

+

+        exit(0)

+

+    launch_utils.startup_timer.record("initial startup")

+

+    with launch_utils.startup_timer.subcategory("prepare environment"):

+        if not args.skip_prepare_environment:

+            prepare_environment()

 

     if args.test_server:

         configure_for_tests()