From db9a833d02636cfe25db21f9b6133f4520cd5300 Mon Sep 17 00:00:00 2001 From: mpl Date: Mon, 27 Oct 2014 22:52:27 +0100 Subject: [PATCH 1/2] devcam test: missing filepath.FromSlash Change-Id: Icc3461d5435702414b1fe716ef81c18a8e3c2c34 --- dev/devcam/test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/devcam/test.go b/dev/devcam/test.go index 4b134a40e..d3b1a20cf 100644 --- a/dev/devcam/test.go +++ b/dev/devcam/test.go @@ -157,7 +157,7 @@ func (c *testCmd) runTests(args []string) error { } func (c *testCmd) runPrecommitHook() error { - out, err := exec.Command("./misc/pre-commit.githook", "test").CombinedOutput() + out, err := exec.Command(filepath.FromSlash("./misc/pre-commit.githook"), "test").CombinedOutput() if err != nil { fmt.Println(string(out)) } From 674deb72806ed7dc3c9a3411fdb07ade8d033784 Mon Sep 17 00:00:00 2001 From: Jingguo Yao Date: Tue, 28 Oct 2014 10:44:01 +0800 Subject: [PATCH 2/2] jsonconfig: remove useless type conversion Change-Id: I271ca5f619dcd7d6cdee3dc40b68dd6c5eb318d8 --- pkg/jsonconfig/jsonconfig.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/jsonconfig/jsonconfig.go b/pkg/jsonconfig/jsonconfig.go index 097b113c5..5f7bd6090 100644 --- a/pkg/jsonconfig/jsonconfig.go +++ b/pkg/jsonconfig/jsonconfig.go @@ -58,7 +58,7 @@ func (jc Obj) obj(key string, optional bool) Obj { jc.appendError(fmt.Errorf("Expected config key %q to be an object, not %T", key, ei)) return make(Obj) } - return Obj(m) + return m } func (jc Obj) RequiredString(key string) string {