TrueCloudLab/restic
16
0
Fork 3
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #620 from restic/watch-529

Browse source 
Add verbose error when marshalling a node fails
This commit is contained in:
Alexander Neumann 2016-09-17 11:05:00 +02:00
commit 98b012a04e
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/restic/archiver/archiver.go
View file

@ -109,8 +109,8 @@ func (arch *Archiver) Save(t restic.BlobType, data []byte, id restic.ID) error {
} }
// SaveTreeJSON stores a tree in the repository. // SaveTreeJSON stores a tree in the repository.
func (arch *Archiver) SaveTreeJSON(item interface{}) (restic.ID, error) { func (arch *Archiver) SaveTreeJSON(tree *restic.Tree) (restic.ID, error) {
data, err := json.Marshal(item) data, err := json.Marshal(tree)
if err != nil { if err != nil {
return restic.ID{}, errors.Wrap(err, "Marshal") return restic.ID{}, errors.Wrap(err, "Marshal")
} }

18
src/restic/node.go
View file

@ -260,6 +260,24 @@ func (node *Node) createFifoAt(path string) error {
} }
func (node Node) MarshalJSON() ([]byte, error) { func (node Node) MarshalJSON() ([]byte, error) {
if node.ModTime.Year() < 0 || node.ModTime.Year() > 9999 {
err := errors.Errorf("node %v has invalid ModTime year %d: %v",
node.Path, node.ModTime.Year(), node.ModTime)
return nil, err
}
if node.ChangeTime.Year() < 0 || node.ChangeTime.Year() > 9999 {
err := errors.Errorf("node %v has invalid ChangeTime year %d: %v",
node.Path, node.ChangeTime.Year(), node.ChangeTime)
return nil, err
}
if node.AccessTime.Year() < 0 || node.AccessTime.Year() > 9999 {
err := errors.Errorf("node %v has invalid AccessTime year %d: %v",
node.Path, node.AccessTime.Year(), node.AccessTime)
return nil, err
}
type nodeJSON Node type nodeJSON Node
nj := nodeJSON(node) nj := nodeJSON(node)
name := strconv.Quote(node.Name) name := strconv.Quote(node.Name)