Skip to content

Commit

Permalink
basic implementation of ext-vs-ext conflict resolution via manual use…
Browse files Browse the repository at this point in the history
…r input now functional

- needs better output
  • Loading branch information
telamonian committed Aug 9, 2024
1 parent c5d696b commit 2efb3a7
Showing 1 changed file with 17 additions and 7 deletions.
24 changes: 17 additions & 7 deletions comfy_cli/uv.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,13 +296,23 @@ def compileCorePlusExt(self):
#clean up
self.out.unlink(missing_ok=True)

DependencyCompiler.Compile(
cwd=self.cwd,
reqFiles=(self.reqFilesCore + self.reqFilesExt),
override=self.override,
out=self.out,
resolve_strategy="ask",
)
while True:
try:
DependencyCompiler.Compile(
cwd=self.cwd,
reqFiles=(self.reqFilesCore + self.reqFilesExt),
override=self.override,
out=self.out,
resolve_strategy="ask",
)

break
except subprocess.CalledProcessError as e:
if hasattr(e, "req"):
with open(self.override, "a") as f:
f.write(e.req + "\n")
else:
raise ValueError

def installCorePlusExt(self):
DependencyCompiler.Install(
Expand Down

0 comments on commit 2efb3a7

Please sign in to comment.