openvinotoolkit/stable-diffusion-webui
1
1
Fork 0
mirror of https://github.com/openvinotoolkit/stable-diffusion-webui.git synced 2024-12-14 22:53:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12454 from wfjsw/no-autofix-on-fetch

Browse Source 
rm dir on failed clone, disable autofix for fetch
This commit is contained in:
AUTOMATIC1111 2023-08-10 17:28:29 +03:00 committed by GitHub
commit 9af5cce4c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/launch_utils.py
View File

@ -3,6 +3,7 @@ import logging
import re
import subprocess
import os
import shutil
import sys
import importlib.util
import platform
@ -152,10 +153,8 @@ def run_git(dir, name, command, desc=None, errdesc=None, custom_env=None, live:
try:
return run(f'"{git}" -C "{dir}" {command}', desc=desc, errdesc=errdesc, custom_env=custom_env, live=live)
except RuntimeError:
pass
if not autofix:
return None
if not autofix:
raise
print(f"{errdesc}, attempting autofix...")
git_fix_workspace(dir, name)
@ -174,13 +173,17 @@ def git_clone(url, dir, name, commithash=None):
if current_hash == commithash:
return
run_git('fetch', f"Fetching updates for {name}...", f"Couldn't fetch {name}")
run_git('fetch', f"Fetching updates for {name}...", f"Couldn't fetch {name}", autofix=False)
run_git('checkout', f"Checking out commit for {name} with hash: {commithash}...", f"Couldn't checkout commit {commithash} for {name}", live=True)
return
run(f'"{git}" clone "{url}" "{dir}"', f"Cloning {name} into {dir}...", f"Couldn't clone {name}", live=True)
try:
run(f'"{git}" clone "{url}" "{dir}"', f"Cloning {name} into {dir}...", f"Couldn't clone {name}", live=True)
except RuntimeError:
shutil.rmtree(dir, ignore_errors=True)
raise
if commithash is not None:
run(f'"{git}" -C "{dir}" checkout {commithash}', None, "Couldn't checkout {name}'s hash: {commithash}")