From f523e9f0fd0e0b0ce75879532caa834742297d16 Mon Sep 17 00:00:00 2001
From: Robert van Gent <rvangent@google.com>
Date: Wed, 28 Apr 2021 20:32:19 -0700
Subject: [PATCH] deploy: Don't treat a NotFound response for Delete as a fatal
 error.

---
 deploy/deploy.go | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/deploy/deploy.go b/deploy/deploy.go
index c75461750..96fecdc07 100644
--- a/deploy/deploy.go
+++ b/deploy/deploy.go
@@ -45,6 +45,7 @@ import (
 	_ "gocloud.dev/blob/fileblob" // import
 	_ "gocloud.dev/blob/gcsblob"  // import
 	_ "gocloud.dev/blob/s3blob"   // import
+	"gocloud.dev/gcerrors"
 )
 
 // Deployer supports deploying the site to target cloud providers.
@@ -238,9 +239,13 @@ func (d *Deployer) Deploy(ctx context.Context) error {
 			go func(del string) {
 				jww.INFO.Printf("Deleting %s...\n", del)
 				if err := bucket.Delete(ctx, del); err != nil {
-					errMu.Lock()
-					defer errMu.Unlock()
-					errs = append(errs, err)
+					if gcerrors.Code(err) == gcerrors.NotFound {
+						jww.WARN.Printf("Failed to delete %q because it wasn't found: %v", del, err)
+					} else {
+						errMu.Lock()
+						defer errMu.Unlock()
+						errs = append(errs, err)
+					}
 				}
 				<-sem
 			}(del)