vbatts/go-mtree
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge pull request #151 from vbatts/clean.00

Browse source 
check: remove unused TarCheck(), for Compare()
This commit is contained in:
Vincent Batts 2018-12-10 11:36:56 -05:00 committed by GitHub
commit 53e54ea2f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
check.go
View file

@ -18,13 +18,3 @@ func Check(root string, dh *DirectoryHierarchy, keywords []Keyword, fs FsEval) (
return Compare(dh, newDh, keywords) return Compare(dh, newDh, keywords)
} }
// TarCheck is the tar equivalent of checking a file hierarchy spec against a
// tar stream to determine if files have been changed. This is precisely
// equivalent to Compare(dh, tarDH, keywords).
func TarCheck(tarDH, dh *DirectoryHierarchy, keywords []Keyword) ([]InodeDelta, error) {
if keywords == nil {
return Compare(dh, tarDH, dh.UsedKeywords())
}
return Compare(dh, tarDH, keywords)
}

8
tar_test.go
View file

@ -109,7 +109,7 @@ func TestTar(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
res, err := TarCheck(tdh, dh, append(DefaultKeywords, "sha1")) res, err := Compare(tdh, dh, append(DefaultKeywords, "sha1"))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -164,7 +164,7 @@ func TestArchiveCreation(t *testing.T) {
} }
// Test the tar manifest against itself // Test the tar manifest against itself
res, err = TarCheck(tdh, tdh, []Keyword{"sha1"}) res, err = Compare(tdh, tdh, []Keyword{"sha1"})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -180,7 +180,7 @@ func TestArchiveCreation(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
res, err = TarCheck(tdh, dh, []Keyword{"sha1"}) res, err = Compare(tdh, dh, []Keyword{"sha1"})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -218,7 +218,7 @@ func TestTreeTraversal(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
res, err := TarCheck(tdh, tdh, []Keyword{"sha1"}) res, err := Compare(tdh, tdh, []Keyword{"sha1"})
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }