Skip to content

Commit

Permalink
Tested new kobopatch parsing and removed old one
Browse files Browse the repository at this point in the history
  • Loading branch information
pgaskin committed Jul 17, 2019
1 parent 902d223 commit a7411a2
Show file tree
Hide file tree
Showing 8 changed files with 172 additions and 660 deletions.
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ require (
github.com/spf13/pflag v0.0.0-20181212140101-916c5bf2d89a
github.com/stretchr/testify v0.0.0-20180319223459-c679ae2cc0cb
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8
gopkg.in/yaml.v2 v2.2.2
gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22
)

Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,3 @@ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofm
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
4 changes: 2 additions & 2 deletions kobopatch/kobopatch.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/xi2/xz"

"github.com/geek1011/kobopatch/patchfile"
"github.com/geek1011/kobopatch/patchfile/kobopatchv2"
"github.com/geek1011/kobopatch/patchfile/kobopatch"
_ "github.com/geek1011/kobopatch/patchfile/patch32lsb"

"github.com/spf13/pflag"
Expand Down Expand Up @@ -651,7 +651,7 @@ func (k *KoboPatch) RunPatchTests() (map[string]map[string]error, error) {

res[pfn] = map[string]error{}

sortedNames := reflect.ValueOf(ps).Interface().(*kobopatchv2.PatchSet).SortedNames()
sortedNames := reflect.ValueOf(ps).Interface().(*kobopatch.PatchSet).SortedNames()

errs := map[string]error{}
for _, name := range sortedNames {
Expand Down
2 changes: 1 addition & 1 deletion kobopatch/kobopatch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)

func TestStringSlice(t *testing.T) {
Expand Down
Loading

0 comments on commit a7411a2

Please # to comment.