vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

tarsum: version the addition of xattrs

Browse source 
Now that TarSum can be versioned, move the addition of xattr headers in
to the next version of TarSum

Signed-off-by: Vincent Batts <vbatts@redhat.com>
This commit is contained in:
Vincent Batts 2014-09-15 16:08:05 -04:00
parent 3417eb9f00
commit 1fd5c14258
2 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tarsum/tarsum.go
View file

@ -81,7 +81,7 @@ func (ts tarSum) selectHeaders(h *tar.Header, v Version) (set [][2]string) {
{"devmajor", strconv.Itoa(int(h.Devmajor))},
{"devminor", strconv.Itoa(int(h.Devminor))},
} {
if v == VersionDev && elem[0] == "mtime" {
if v >= VersionDev && elem[0] == "mtime" {
continue
}
set = append(set, elem)
@ -97,14 +97,16 @@ func (ts *tarSum) encodeHeader(h *tar.Header) error {
}
// include the additional pax headers, from an ordered list
var keys []string
for k := range h.Xattrs {
keys = append(keys, k)
}
sort.Strings(keys)
for _, k := range keys {
if _, err := ts.h.Write([]byte(k + h.Xattrs[k])); err != nil {
return err
if ts.Version() >= VersionDev {
var keys []string
for k := range h.Xattrs {
keys = append(keys, k)
}
sort.Strings(keys)
for _, k := range keys {
if _, err := ts.h.Write([]byte(k + h.Xattrs[k])); err != nil {
return err
}
}
}
return nil