Merge pull request #3002 from rhatdan/test1

Revert patch to allow copying of empty dirs.

add.go

@@ -303,13 +303,6 @@ func (b *Builder) Add(destination string, extract bool, options AddAndCopyOption
 		renameTarget = filepath.Base(extractDirectory)
 		extractDirectory = filepath.Dir(extractDirectory)
 	}
-
-	// if the destination is a directory that doesn't yet exist, let's copy it.
-	newDestDirFound := false
-	if (len(destStats) == 1 || len(destStats[0].Globbed) == 0) && destMustBeDirectory && !destCanBeFile {
-		newDestDirFound = true
-	}
-
 	if len(destStats) == 1 && len(destStats[0].Globbed) == 1 && destStats[0].Results[destStats[0].Globbed[0]].IsRegular {
 		if destMustBeDirectory {
 			return errors.Errorf("destination %v already exists but is not a directory", destination)
@@ -400,12 +393,6 @@ func (b *Builder) Add(destination string, extract bool, options AddAndCopyOption
 
 		// Iterate through every item that matched the glob.
 		itemsCopied := 0
-
-		// if the destination is a directory that doesn't yet exist, let's copy it.
-		if newDestDirFound {
-			itemsCopied++
-		}
-
 		for _, glob := range localSourceStat.Globbed {
 			rel, err := filepath.Rel(contextDir, glob)
 			if err != nil {

tests/bud.bats

@@ -2562,25 +2562,3 @@ _EOF
   run_buildah manifest inspect testlist
   expect_output --substring $digest
 }
-
-@test "bud test empty newdir" {
-  _prefetch alpine
-  mytmpdir=${TESTDIR}/my-dir
-  mkdir -p ${mytmpdir}
-cat > $mytmpdir/Containerfile << _EOF
-FROM alpine as galaxy
-
-RUN mkdir -p /usr/share/ansible/roles /usr/share/ansible/collections
-RUN echo "bar"
-RUN echo "foo" > /usr/share/ansible/collections/file.txt
-
-FROM galaxy
-
-RUN mkdir -p /usr/share/ansible/roles /usr/share/ansible/collections
-COPY --from=galaxy /usr/share/ansible/roles /usr/share/ansible/roles
-COPY --from=galaxy /usr/share/ansible/collections /usr/share/ansible/collections
-_EOF
-
-  run_buildah bud --layers --signature-policy ${TESTSDIR}/policy.json -t testbud $mytmpdir                                                   
-  expect_output --substring "COPY --from=galaxy /usr/share/ansible/collections /usr/share/ansible/collections"
-}