0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

archive: cleanup and more information

Browse source 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
This commit is contained in:
Vincent Batts 2014-10-28 17:01:10 -04:00 committed by Vincent Batts
parent f710a8d774
commit f14a9ed011
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/archive/archive.go
View file

@ -193,7 +193,6 @@ func (ta *tarAppender) addTarFile(path, name string) error {
hdr.Devmajor = int64(major(uint64(stat.Rdev)))
hdr.Devminor = int64(minor(uint64(stat.Rdev)))
}
}
// if it's a regular file and has more than 1 link,
@ -228,6 +227,7 @@ func (ta *tarAppender) addTarFile(path, name string) error {
}
ta.Buffer.Reset(ta.TarWriter)
defer ta.Buffer.Reset(nil)
_, err = io.Copy(ta.Buffer, file)
file.Close()
if err != nil {
@ -237,7 +237,6 @@ func (ta *tarAppender) addTarFile(path, name string) error {
if err != nil {
return err
}
ta.Buffer.Reset(nil)
}
return nil

6
pkg/archive/changes.go
View file

@ -333,6 +333,8 @@ func ChangesDirs(newDir, oldDir string) ([]Change, error) {
newRoot, err2 = collectFileInfo(newDir)
errs <- err2
}()
// block until both routines have returned
for i := 0; i < 2; i++ {
if err := <-errs; err != nil {
return nil, err
@ -409,7 +411,9 @@ func ExportChanges(dir string, changes []Change) (Archive, error) {
if err := ta.TarWriter.Close(); err != nil {
log.Debugf("Can't close layer: %s", err)
}
writer.Close()
if err := writer.Close(); err != nil {
log.Debugf("failed close Changes writer: %s", err)
}
}()
return reader, nil
}