From 6933dcd18b63093815b2bcfecbf2efb04b5775e4 Mon Sep 17 00:00:00 2001 From: nkuacac Date: Wed, 14 Oct 2015 09:21:04 +0000 Subject: [PATCH] Fix import path for goyaml - also fix the test case for new goyaml Signed-off-by: Rexxar Liang --- Cartridge | 2 +- Cartridge.lock | 2 +- config/config.go | 2 +- config/config_test.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cartridge b/Cartridge index 8e6bf3b..7a7013d 100644 --- a/Cartridge +++ b/Cartridge @@ -7,4 +7,4 @@ github.com/garyburd/redigo/redis origin/master github.com/cloudfoundry/gosteno origin/master github.com/onsi/ginkgo origin/master github.com/onsi/gomega origin/master -launchpad.net/goyaml last:1 +github.com/go-yaml/yaml origin/master diff --git a/Cartridge.lock b/Cartridge.lock index 4844179..40a45cc 100644 --- a/Cartridge.lock +++ b/Cartridge.lock @@ -7,4 +7,4 @@ github.com/garyburd/redigo/redis ed54f4ed86a815cf09870e4bd1a10a2ee39a4308 github.com/cloudfoundry/gosteno 5eb8c6e554f0dfc39d6468813b8ac19ec28fe74f github.com/onsi/ginkgo 32204a3eab0576cbea19f5ff8b27d3a928647ea6 github.com/onsi/gomega a78ae492d53aad5a7a232d0d0462c14c400e3ee7 -launchpad.net/goyaml 51 +github.com/go-yaml/yaml 53feefa2559fb8dfa8d81baad31be332c97d6c77 diff --git a/config/config.go b/config/config.go index 07c052c..f602a03 100644 --- a/config/config.go +++ b/config/config.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "os" - "launchpad.net/goyaml" + goyaml "github.com/go-yaml/yaml" ) type Config interface { diff --git a/config/config_test.go b/config/config_test.go index 199d1e1..11a1d73 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -244,7 +244,7 @@ var _ = Describe("ConfigAndFlags", func() { flags = []string{"-config", tempfile} err = config.Parse(flags) - Ω(err.Error()).Should(ContainSubstring("YAML error")) + Ω(err.Error()).Should(ContainSubstring("yaml: line")) os.RemoveAll(tempfile) }) })