X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=remote%2Fsync%2Ffiles.go;h=56c9ff0003af3c35d9153ba471655479bbc33efe;hb=e0240a60023841709f8095e475d13d090f17e915;hp=507cc174010bdb68ba0d478d07001fe5b66167d2;hpb=d1e310bce2f925d1c1f122dc38277d875debe3f6;p=safcm%2Fsafcm.git

diff --git a/remote/sync/files.go b/remote/sync/files.go
index 507cc17..56c9ff0 100644
--- a/remote/sync/files.go
+++ b/remote/sync/files.go
@@ -1,6 +1,6 @@
 // MsgSyncReq: copy files to the remote host
 
-// Copyright (C) 2021  Simon Ruderich
+// Copyright (C) 2021-2023  Simon Ruderich
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -132,6 +132,14 @@ func (s *Sync) syncFile(file *safcm.File, changed *bool) error {
 
 	parentFd, baseName, err := OpenParentDirectoryNoSymlinks(file.Path)
 	if err != nil {
+		if os.IsNotExist(err) && s.req.DryRun {
+			change.Created = true
+			debugf("will create (parent missing)")
+			*changed = true
+			debugf("dry-run, skipping changes")
+			s.resp.FileChanges = append(s.resp.FileChanges, change)
+			return nil
+		}
 		return err
 	}
 	defer unix.Close(parentFd)
@@ -250,7 +258,7 @@ reopen:
 		}
 
 		// Compare file content (if possible)
-		switch change.Old.Mode.Type() {
+		switch change.Old.Mode.Type() { //nolint:exhaustive
 		case 0: // regular file
 			x, err := io.ReadAll(oldFh)
 			if err != nil {
@@ -446,7 +454,7 @@ reopen:
 		err = unix.Fchownat(parentFd, tmpBase, file.Uid, file.Gid,
 			unix.AT_SYMLINK_NOFOLLOW)
 		if err != nil {
-			unix.Unlinkat(parentFd, tmpBase, 0)
+			unix.Unlinkat(parentFd, tmpBase, 0) //nolint:errcheck
 			return err
 		}
 		// Permissions are irrelevant for symlinks (on most systems)
@@ -458,7 +466,7 @@ reopen:
 	debugf("renaming %q", slashpath.Join(dir, tmpBase))
 	err = unix.Renameat(parentFd, tmpBase, parentFd, baseName)
 	if err != nil {
-		unix.Unlinkat(parentFd, tmpBase, 0)
+		unix.Unlinkat(parentFd, tmpBase, 0) //nolint:errcheck
 		return err
 	}
 	// To guarantee durability fsync must be called on a parent directory
@@ -659,31 +667,31 @@ func WriteTempAt(dirFd int, base string, data []byte, uid, gid int,
 	_, err = fh.Write(data)
 	if err != nil {
 		fh.Close()
-		unix.Unlinkat(dirFd, tmpBase, 0)
+		unix.Unlinkat(dirFd, tmpBase, 0) //nolint:errcheck
 		return "", err
 	}
 	// createTempAt() creates the file with 0600
 	err = fh.Chown(uid, gid)
 	if err != nil {
 		fh.Close()
-		unix.Unlinkat(dirFd, tmpBase, 0)
+		unix.Unlinkat(dirFd, tmpBase, 0) //nolint:errcheck
 		return "", err
 	}
 	err = fh.Chmod(mode)
 	if err != nil {
 		fh.Close()
-		unix.Unlinkat(dirFd, tmpBase, 0)
+		unix.Unlinkat(dirFd, tmpBase, 0) //nolint:errcheck
 		return "", err
 	}
 	err = fh.Sync()
 	if err != nil {
 		fh.Close()
-		unix.Unlinkat(dirFd, tmpBase, 0)
+		unix.Unlinkat(dirFd, tmpBase, 0) //nolint:errcheck
 		return "", err
 	}
 	err = fh.Close()
 	if err != nil {
-		unix.Unlinkat(dirFd, tmpBase, 0)
+		unix.Unlinkat(dirFd, tmpBase, 0) //nolint:errcheck
 		return "", err
 	}