diff options
| -rw-r--r-- | env.go | 8 | ||||
| -rw-r--r-- | package.go | 18 |
2 files changed, 12 insertions, 14 deletions
@@ -261,7 +261,7 @@ func (env *Env) GetLocalPackage(importPath string) (pkg *Package, err error) { return } - pkg, err = NewPackage(env.dirSrc, importPath) + pkg, err = NewPackage(env.dirSrc, importPath, importPath) if err != nil { return } @@ -339,7 +339,7 @@ func (env *Env) GetUnused(srcPath string) (err error) { continue } - pkg, err = NewPackage(env.dirSrc, importPath) + pkg, err = NewPackage(env.dirSrc, importPath, importPath) if err != nil { return } @@ -503,7 +503,7 @@ func (env *Env) newPackage(fullPath string) (err error) { return } - pkg, err := NewPackage(env.dirSrc, pkgName) + pkg, err := NewPackage(env.dirSrc, pkgName, pkgName) if err != nil { return } @@ -1201,7 +1201,7 @@ func (env *Env) Sync(pkgName, importPath string) (err error) { return } - newPkg, err := NewPackage(env.dirSrc, importPath) + newPkg, err := NewPackage(env.dirSrc, pkgName, importPath) if err != nil { return } @@ -50,33 +50,31 @@ type Package struct { // NewPackage create a package set the package version, tag status, and // dependencies. // -func NewPackage(gopathSrc, importPath string) ( - pkg *Package, err error, -) { - repoRoot, err := vcs.RepoRootForImportPath(importPath, debug.Value >= 1) +func NewPackage(gopathSrc, name, importPath string) (pkg *Package, err error) { + repoRoot, err := vcs.RepoRootForImportPath(name, debug.Value >= 1) if err != nil { fmt.Fprintf(defStderr, "[PKG] NewPackage >>> error: %s\n", err.Error()) return } - if debug.Value >= 2 { - fmt.Printf("[PKG] NewPackage >>> %+v\n", *repoRoot) - } - if repoRoot.VCS.Cmd != VCSModeGit { err = fmt.Errorf(errVCS, repoRoot.VCS.Cmd) return nil, err } pkg = &Package{ - ImportPath: repoRoot.Root, - FullPath: filepath.Join(gopathSrc, repoRoot.Root), + ImportPath: importPath, + FullPath: filepath.Join(gopathSrc, importPath), RemoteName: gitDefRemoteName, RemoteURL: repoRoot.Repo, vcsMode: repoRoot.VCS.Cmd, state: packageStateNew, } + if debug.Value >= 2 { + fmt.Printf("[PKG] NewPackage >>> %+v\n", pkg) + } + return } |
