Merge pull request #2063 from dmcgowan/cherry-pick-2054

stevvooe · web-flow · commit 3e89d82e0588 · 2018-01-25T15:08:51.000-08:00
[release/1.0] archive: fix duplicate directories entries on metadata change
diff --git a/archive/tar.go b/archive/tar.go
@@ -572,6 +572,9 @@ func (cw *changeWriter) includeParents(hdr *tar.Header) error {
 			}
 		}
 	}
+	if hdr.Typeflag == tar.TypeDir {
+		cw.addedDirs[name] = struct{}{}
+	}
 	return nil
 }
 
diff --git a/archive/tar_test.go b/archive/tar_test.go
@@ -867,7 +867,7 @@ func TestDiffTar(t *testing.T) {
 				fileEntry("d2/l1", []byte("link me"), 0644),
 				// d1/f1 and its parent is included after the new link,
 				// before the new link was included, these files would
-				// not habe needed
+				// not have been needed
 				dirEntry("d1/", 0755),
 				linkEntry("d1/f1", "d2/l1"),
 				dirEntry("d3/", 0755),
@@ -898,6 +898,55 @@ func TestDiffTar(t *testing.T) {
 				fstest.Remove("/d6/l2"),
 			),
 		},
+		{
+			name: "UpdateDirectoryPermission",
+			validators: []tarEntryValidator{
+				dirEntry("d1/", 0777),
+				dirEntry("d1/d/", 0700),
+				dirEntry("d2/", 0770),
+				fileEntry("d2/f", []byte("ok"), 0644),
+			},
+			a: fstest.Apply(
+				fstest.CreateDir("/d1/", 0755),
+				fstest.CreateDir("/d2/", 0770),
+			),
+			b: fstest.Apply(
+				fstest.Chmod("/d1", 0777),
+				fstest.CreateDir("/d1/d", 0700),
+				fstest.CreateFile("/d2/f", []byte("ok"), 0644),
+			),
+		},
+		{
+			name: "HardlinkUpdatedParent",
+			validators: []tarEntryValidator{
+				dirEntry("d1/", 0777),
+				dirEntry("d2/", 0755),
+				fileEntry("d2/l1", []byte("link me"), 0644),
+				// d1/f1 is included after the new link, its
+				// parent has already changed and therefore
+				// only the linked file is included
+				linkEntry("d1/f1", "d2/l1"),
+				dirEntry("d4/", 0777),
+				fileEntry("d4/l1", []byte("link me"), 0644),
+				dirEntry("d3/", 0755),
+				linkEntry("d3/f1", "d4/l1"),
+			},
+			a: fstest.Apply(
+				fstest.CreateDir("/d1/", 0755),
+				fstest.CreateFile("/d1/f1", []byte("link me"), 0644),
+				fstest.CreateDir("/d2/", 0755),
+				fstest.CreateFile("/d2/f1", []byte("link me"), 0644),
+				fstest.CreateDir("/d3/", 0755),
+				fstest.CreateFile("/d3/f1", []byte("link me"), 0644),
+				fstest.CreateDir("/d4/", 0755),
+			),
+			b: fstest.Apply(
+				fstest.Chmod("/d1", 0777),
+				fstest.Link("/d1/f1", "/d2/l1"),
+				fstest.Chmod("/d4", 0777),
+				fstest.Link("/d3/f1", "/d4/l1"),
+			),
+		},
 	}
 
 	for _, at := range tests {

Original file line number	Diff line number	Diff line change
`@@ -572,6 +572,9 @@ func (cw changeWriter) includeParents(hdr tar.Header) error {`
`572`	`572`	`}`
`573`	`573`	`}`
`574`	`574`	`}`
	`575`	`+ if hdr.Typeflag == tar.TypeDir {`
	`576`	`+ cw.addedDirs[name] = struct{}{}`
	`577`	`+ }`
`575`	`578`	`return nil`
`576`	`579`	`}`
`577`	`580`