docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3915 from crosbymichael/no-double-put 

No no put put
This commit is contained in:
unclejack 2014-02-03 16:40:44 -08:00
parent b56440fa24 02fdc194fc
commit b5d6208ccf
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
container.go
View File

@ -1416,9 +1416,12 @@ func (container *Container) ExportRw() (archive.Archive, error) {
if container.runtime == nil { if container.runtime == nil {
return nil, fmt.Errorf("Can't load storage driver for unregistered container %s", container.ID) return nil, fmt.Errorf("Can't load storage driver for unregistered container %s", container.ID)
} }
defer container.Unmount() archive, err := container.runtime.Diff(container)
if err != nil {
return container.runtime.Diff(container) container.Unmount()
return nil, err
}
return EofReader(archive, func() { container.Unmount() }), nil
} }
func (container *Container) Export() (archive.Archive, error) { func (container *Container) Export() (archive.Archive, error) {
@ -1428,6 +1431,7 @@ func (container *Container) Export() (archive.Archive, error) {
archive, err := archive.Tar(container.basefs, archive.Uncompressed) archive, err := archive.Tar(container.basefs, archive.Uncompressed)
if err != nil { if err != nil {
container.Unmount()
return nil, err return nil, err
} }
return EofReader(archive, func() { container.Unmount() }), nil return EofReader(archive, func() { container.Unmount() }), nil

2
image.go
View File

@ -163,7 +163,7 @@ func (img *Image) TarLayer() (arch archive.Archive, err error) {
} }
defer func() { defer func() {
if err == nil { if err != nil {
driver.Put(img.ID) driver.Put(img.ID)
} }
}() }()