From 7e4b5c4f3fd87fda5fea93da3a2551c9e9753dad Mon Sep 17 00:00:00 2001 From: mortael Date: Sun, 31 Dec 2023 19:41:59 +0100 Subject: [PATCH 1/2] Fix for adding ComfyUI path to Git safe.directory Git wants a path that looks like this: D:/ComfyUI --- __init__.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/__init__.py b/__init__.py index a428cc84..4f6b0448 100644 --- a/__init__.py +++ b/__init__.py @@ -317,8 +317,9 @@ def __win_check_git_update(path, do_fetch=False, do_update=False): if 'detected dubious' in output: try: # fix and try again - print(f"[ComfyUI-Manager] Try fixing 'dubious repository' error on '{path}' repo") - process = subprocess.Popen(['git', 'config', '--global', '--add', 'safe.directory', path], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + safedir_path = path.replace('\\', '/') + print(f"[ComfyUI-Manager] Try fixing 'dubious repository' error on '{safedir_path}' repo") + process = subprocess.Popen(['git', 'config', '--global', '--add', 'safe.directory', safedir_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE) output, _ = process.communicate() process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -330,7 +331,7 @@ def __win_check_git_update(path, do_fetch=False, do_update=False): if 'detected dubious' in output: print(f'\n[ComfyUI-Manager] Failed to fixing repository setup. Please execute this command on cmd: \n' f'-----------------------------------------------------------------------------------------\n' - f'git config --global --add safe.directory "{path}"\n' + f'git config --global --add safe.directory "{safedir_path}"\n' f'-----------------------------------------------------------------------------------------\n') if do_update: @@ -1516,16 +1517,17 @@ async def update_comfyui(request): try: remote.fetch() - except Exception as e: + except Exception as str(e): if 'detected dubious' in e: print(f"[ComfyUI-Manager] Try fixing 'dubious repository' error on 'ComfyUI' repository") - subprocess.run(['git', 'config', '--global', '--add', 'safe.directory', comfy_path]) + safedir_path = comfy_path.replace('\\', '/') + subprocess.run(['git', 'config', '--global', '--add', 'safe.directory', safedir_path]) try: remote.fetch() except Exception: print(f"\n[ComfyUI-Manager] Failed to fixing repository setup. Please execute this command on cmd: \n" f"-----------------------------------------------------------------------------------------\n" - f'git config --global --add safe.directory "{comfy_path}"\n' + f'git config --global --add safe.directory "{safedir_path}"\n' f"-----------------------------------------------------------------------------------------\n") commit_hash = repo.head.commit.hexsha From 2268036fe05d8e61bd6814748fd051176b9deb36 Mon Sep 17 00:00:00 2001 From: mortael Date: Sun, 31 Dec 2023 19:48:48 +0100 Subject: [PATCH 2/2] Update __init__.py --- __init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/__init__.py b/__init__.py index 4f6b0448..278cc85c 100644 --- a/__init__.py +++ b/__init__.py @@ -1517,8 +1517,8 @@ async def update_comfyui(request): try: remote.fetch() - except Exception as str(e): - if 'detected dubious' in e: + except Exception as e: + if 'detected dubious' in str(e): print(f"[ComfyUI-Manager] Try fixing 'dubious repository' error on 'ComfyUI' repository") safedir_path = comfy_path.replace('\\', '/') subprocess.run(['git', 'config', '--global', '--add', 'safe.directory', safedir_path])