Merge pull request #145 from nathanegillett/9158

release-engineering · Dec 8, 2021 · 8bf9b14 · 8bf9b14
2 parents 844d018 + 9b89283
commit 8bf9b14
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/internal/cmd/cmd_sync_test.go b/internal/cmd/cmd_sync_test.go
@@ -602,7 +602,7 @@ func TestMainSyncFilesFrom(t *testing.T) {
 		"rsync",
 		"-vvv",
 		"--files-from", filesFromPath,
-		srcPath + "/",
+		srcPath,
 		"exodus:/dest",
 	}
 

diff --git a/internal/cmd/exodus.go b/internal/cmd/exodus.go
@@ -75,6 +75,12 @@ func exodusMain(ctx context.Context, cfg conf.Config, args args.Config) int {
 	if args.FilesFrom != "" {
 		args.Relative = true
 
+		// When using --files-from, we don't want to recreate the source directory.
+		// Ensure the source path ends with a slash (/), indicating we only want it's contents.
+		if !strings.HasSuffix(args.Src, "/") {
+			args.Src += "/"
+		}
+
 		f, err := os.Open(args.FilesFrom)
 		if err != nil {
 			logger.F("src", args.Src, "error", err).Error("can't read --files-from file")