From dab97bf46ae768ff8f4bf0da16ea9c6c36ca3f35 Mon Sep 17 00:00:00 2001
From: Fabian Kramm <kramm@covexo.com>
Date: Tue, 11 Sep 2018 11:30:20 +0200
Subject: [PATCH] Small sync improvements

---
 pkg/devspace/sync/downstream.go | 1 -
 pkg/devspace/sync/upstream.go   | 2 +-
 pkg/devspace/sync/util.go       | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkg/devspace/sync/downstream.go b/pkg/devspace/sync/downstream.go
index b4c2692bae..0988212eca 100644
--- a/pkg/devspace/sync/downstream.go
+++ b/pkg/devspace/sync/downstream.go
@@ -345,7 +345,6 @@ func (d *downstream) removeFilesAndFolders(removeFiles map[string]*fileInformati
 				err := os.Remove(absFilepath)
 				if err != nil {
 					d.config.Logf("[Downstream] Skip file delete %s: %v", key, err)
-					continue
 				}
 			}
 		} else {
diff --git a/pkg/devspace/sync/upstream.go b/pkg/devspace/sync/upstream.go
index 3c73a53cd3..f09e31281f 100644
--- a/pkg/devspace/sync/upstream.go
+++ b/pkg/devspace/sync/upstream.go
@@ -360,7 +360,7 @@ func (u *upstream) applyRemoves(files []*fileInformation) error {
 		}
 
 		if removeArguments > 0 {
-			rmCommand += " >/dev/null && printf \"" + EndAck + "\" || printf \"" + EndAck + "\"\n"
+			rmCommand += " >/dev/null 2>/dev/null && printf \"" + EndAck + "\" || printf \"" + EndAck + "\"\n"
 
 			if u.stdinPipe != nil {
 				_, err := u.stdinPipe.Write([]byte(rmCommand))
diff --git a/pkg/devspace/sync/util.go b/pkg/devspace/sync/util.go
index b0e94a0911..6f4db57a5f 100644
--- a/pkg/devspace/sync/util.go
+++ b/pkg/devspace/sync/util.go
@@ -262,7 +262,6 @@ func deleteSafeRecursive(basepath, relativePath string, fileMap map[string]*file
 				err = os.Remove(absFilepath)
 				if err != nil {
 					config.Logf("[Downstream] Skip file delete %s: %v", relativePath, err)
-					continue
 				}
 			}
 		} else {