Skip to content

Commit 0809a43

Browse files
authored
Merge pull request #177 from covexo/sync-improvements
Small sync improvements
2 parents 7d7936c + dab97bf commit 0809a43

3 files changed

Lines changed: 1 addition & 3 deletions

File tree

pkg/devspace/sync/downstream.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,6 @@ func (d *downstream) removeFilesAndFolders(removeFiles map[string]*fileInformati
345345
err := os.Remove(absFilepath)
346346
if err != nil {
347347
d.config.Logf("[Downstream] Skip file delete %s: %v", key, err)
348-
continue
349348
}
350349
}
351350
} else {

pkg/devspace/sync/upstream.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ func (u *upstream) applyRemoves(files []*fileInformation) error {
360360
}
361361

362362
if removeArguments > 0 {
363-
rmCommand += " >/dev/null && printf \"" + EndAck + "\" || printf \"" + EndAck + "\"\n"
363+
rmCommand += " >/dev/null 2>/dev/null && printf \"" + EndAck + "\" || printf \"" + EndAck + "\"\n"
364364

365365
if u.stdinPipe != nil {
366366
_, err := u.stdinPipe.Write([]byte(rmCommand))

pkg/devspace/sync/util.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ func deleteSafeRecursive(basepath, relativePath string, fileMap map[string]*file
262262
err = os.Remove(absFilepath)
263263
if err != nil {
264264
config.Logf("[Downstream] Skip file delete %s: %v", relativePath, err)
265-
continue
266265
}
267266
}
268267
} else {

0 commit comments

Comments
 (0)