Merge remote-tracking branch 'origin/dev' into soft-inpainting

# Conflicts:
#	modules/processing.py

1 files changed, 3 insertions, 3 deletions

diff --git a/modules/launch_utils.py b/modules/launch_utils.py
index 6e54d063..264ec9ca 100644
--- a/modules/launch_utils.py
+++ b/modules/launch_utils.py
@@ -64,7 +64,7 @@ Use --skip-python-version-check to suppress this warning.
 @lru_cache()

 def commit_hash():

     try:

-        return subprocess.check_output([git, "rev-parse", "HEAD"], shell=False, encoding='utf8').strip()

+        return subprocess.check_output([git, "-C", script_path, "rev-parse", "HEAD"], shell=False, encoding='utf8').strip()

     except Exception:

         return "<none>"

 

@@ -72,7 +72,7 @@ def commit_hash():
 @lru_cache()

 def git_tag():

     try:

-        return subprocess.check_output([git, "describe", "--tags"], shell=False, encoding='utf8').strip()

+        return subprocess.check_output([git, "-C", script_path, "describe", "--tags"], shell=False, encoding='utf8').strip()

     except Exception:

         try:

 

@@ -441,7 +441,7 @@ def dump_sysinfo():
     import datetime

 

     text = sysinfo.get()

-    filename = f"sysinfo-{datetime.datetime.utcnow().strftime('%Y-%m-%d-%H-%M')}.txt"

+    filename = f"sysinfo-{datetime.datetime.utcnow().strftime('%Y-%m-%d-%H-%M')}.json"

 

     with open(filename, "w", encoding="utf8") as file:

         file.write(text)