mirror of
https://github.com/containers/podman.git
synced 2025-12-02 02:58:03 +08:00
vendor latest c/{buildah,common,image,storage}
Make sure everything passes for rc2. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
7
vendor/github.com/containers/buildah/add.go
generated
vendored
7
vendor/github.com/containers/buildah/add.go
generated
vendored
@@ -495,8 +495,8 @@ func (b *Builder) Add(destination string, extract bool, options AddAndCopyOption
|
||||
wg.Add(1)
|
||||
if sourceIsGit(src) {
|
||||
go func() {
|
||||
var cloneDir string
|
||||
cloneDir, _, getErr = define.TempDirForURL(tmpdir.GetTempDir(), "", src)
|
||||
var cloneDir, subdir string
|
||||
cloneDir, subdir, getErr = define.TempDirForURL(tmpdir.GetTempDir(), "", src)
|
||||
getOptions := copier.GetOptions{
|
||||
UIDMap: srcUIDMap,
|
||||
GIDMap: srcGIDMap,
|
||||
@@ -511,7 +511,8 @@ func (b *Builder) Add(destination string, extract bool, options AddAndCopyOption
|
||||
StripStickyBit: options.StripStickyBit,
|
||||
}
|
||||
writer := io.WriteCloser(pipeWriter)
|
||||
getErr = copier.Get(cloneDir, cloneDir, getOptions, []string{"."}, writer)
|
||||
repositoryDir := filepath.Join(cloneDir, subdir)
|
||||
getErr = copier.Get(repositoryDir, repositoryDir, getOptions, []string{"."}, writer)
|
||||
pipeWriter.Close()
|
||||
wg.Done()
|
||||
}()
|
||||
|
||||
Reference in New Issue
Block a user