From 96d0cd92f2307ccffacc6260b45651ff17bf3322 Mon Sep 17 00:00:00 2001 From: Josh Yan Date: Wed, 10 Jul 2024 11:31:53 -0700 Subject: [PATCH] rebase --- cmd/cmd.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cmd/cmd.go b/cmd/cmd.go index 2f7bd94f9..a121a8078 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -318,6 +318,7 @@ func createBlob(cmd *cobra.Command, client *api.Client, path string, spinner *pr digest := fmt.Sprintf("sha256:%x", hash.Sum(nil)) +<<<<<<< HEAD // We check if we can find the models directory locally // If we can, we return the path to the directory // If we can't, we return an error @@ -334,6 +335,12 @@ func createBlob(cmd *cobra.Command, client *api.Client, path string, spinner *pr // Linux errors out to use io.copy err = localCopy(path, dest) if err == nil { +======= + if client.IsLocal() { + dest, err := getLocalPath(cmd.Context(), digest) + + if errors.Is(err, ErrBlobExists) { +>>>>>>> 7837266d (import local) return digest, nil } @@ -344,7 +351,10 @@ func createBlob(cmd *cobra.Command, client *api.Client, path string, spinner *pr } } +<<<<<<< HEAD // If at any point copying the blob over locally fails, we default to the copy through the server +======= +>>>>>>> 7837266d (import local) if err = client.CreateBlob(cmd.Context(), digest, io.TeeReader(bin, &pw)); err != nil { return "", err }