Merge pull request #1248 from dgageot/fix-1247

Fix jib errors on ctrl-c

cmd/skaffold/skaffold.go

@@ -17,13 +17,20 @@ limitations under the License.
 package main
 
 import (
+	"context"
+
+	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 
 	"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app"
 )
 
 func main() {
 	if err := app.Run(); err != nil {
-		logrus.Fatal(err)
+		if errors.Cause(err) == context.Canceled {
+			logrus.Debugln(errors.Wrap(err, "ignore error since context is cancelled"))
+		} else {
+			logrus.Fatal(err)
+		}
 	}
 }

pkg/skaffold/jib/jib.go

@@ -17,11 +17,10 @@ limitations under the License.
 package jib
 
 import (
+	"os"
 	"os/exec"
 	"sort"
 
-	"os"
-
 	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
 	"github.com/karrick/godirwalk"
 	"github.com/pkg/errors"
@@ -31,10 +30,6 @@ import (
 func getDependencies(cmd *exec.Cmd) ([]string, error) {
 	stdout, err := util.RunCmdOut(cmd)
 	if err != nil {
-		// if terminated because of ^C then act as if all is well
-		if util.IsTerminatedError(err) {
-			return nil, nil
-		}
 		return nil, err
 	}
 

pkg/skaffold/runner/runner.go

@@ -465,6 +465,13 @@ func DependenciesForArtifact(ctx context.Context, a *latest.Artifact) ([]string,
 	}
 
 	if err != nil {
+		// if the context was cancelled act as if all is well
+		// TODO(dgageot): this should be even higher in the call chain.
+		if ctx.Err() == context.Canceled {
+			logrus.Debugln(errors.Wrap(err, "ignore error since context is cancelled"))
+			return nil, nil
+		}
+
 		return nil, err
 	}