diff options
| -rw-r--r-- | env.go | 5 | ||||
| -rw-r--r-- | package.go | 7 | ||||
| -rw-r--r-- | vendormode.go | 3 |
3 files changed, 1 insertions, 14 deletions
@@ -1364,11 +1364,6 @@ func (env *Env) build(pkg *Package) (err error) { vendorCmdDep = append(vendorCmdDep, "-v") } err = pkg.Run(env, vendorCmdDep) - } else if cmd&vendorModeGdm > 0 { - if Debug >= DebugL2 { - vendorCmdGdm = append(vendorCmdGdm, "-v") - } - err = pkg.Run(env, vendorCmdGdm) } else if cmd&vendorModeGovendor > 0 { err = pkg.Run(env, vendorCmdGovendor) } @@ -308,8 +308,8 @@ func (pkg *Package) ScanDeps(env *Env) (err error) { // ScanBuild files on package root directory. The following build files is // known by beku, // -// * Godeps: gdm // * Gopkg.toml: dep +// * vendor/vendor.json: govendor // func (pkg *Package) ScanBuild() (cmd vendorMode) { ok := IsFileExist(pkg.FullPath, vendorFileDep) @@ -317,11 +317,6 @@ func (pkg *Package) ScanBuild() (cmd vendorMode) { cmd |= vendorModeDep return } - ok = IsFileExist(pkg.FullPath, vendorFileGdm) - if ok { - cmd |= vendorModeGdm - return - } ok = IsFileExist(pkg.FullPath, vendorFileGovendor) if ok { cmd |= vendorModeGovendor diff --git a/vendormode.go b/vendormode.go index 3a6cbba..1dc54f8 100644 --- a/vendormode.go +++ b/vendormode.go @@ -8,18 +8,15 @@ type vendorMode uint const ( vendorModeDep vendorMode = 1 << iota - vendorModeGdm vendorModeGovendor ) const ( vendorFileDep = "Gopkg.toml" - vendorFileGdm = "Godeps" vendorFileGovendor = "vendor/vendor.json" ) var ( vendorCmdDep = []string{"dep", "ensure"} - vendorCmdGdm = []string{"gdm", "restore"} vendorCmdGovendor = []string{"govendor", "sync"} ) |