all: prefix the error in Package Remove and gitInstall

3 files changed, 17 insertions, 17 deletions

diff --git a/package.go b/package.go
index 1f45948..08772ae 100644
--- a/package.go
+++ b/package.go
@@ -201,21 +201,20 @@ func (pkg *Package) IsNewer(older *Package) bool {
 
 // Remove package installed binaries, archives, and source.
 func (pkg *Package) Remove() (err error) {
+	var logp = `Remove`
+
 	err = pkg.GoClean()
 	if err != nil {
-		err = fmt.Errorf("Remove: %s", err)
-		return
+		return fmt.Errorf(`%s: %w`, logp, err)
 	}
 
 	if debug.Value >= 1 {
-		fmt.Printf("[PKG] Remove %s >>> %s\n", pkg.ImportPath,
-			pkg.FullPath)
+		fmt.Printf("%s: %s >>> %s\n", logp, pkg.ImportPath, pkg.FullPath)
 	}
 
 	err = os.RemoveAll(pkg.FullPath)
 	if err != nil {
-		err = fmt.Errorf("Remove: %s", err)
-		return
+		return fmt.Errorf(`%s: %w`, logp, err)
 	}
 
 	_ = libio.RmdirEmptyAll(pkg.FullPath)
diff --git a/package_git.go b/package_git.go
index 904e31f..200c04f 100644
--- a/package_git.go
+++ b/package_git.go
@@ -39,10 +39,11 @@ func (pkg *Package) gitFreeze() (err error) {
 
 // gitInstall the package into source directory.
 func (pkg *Package) gitInstall() (err error) {
+	var logp = `gitInstall`
+
 	err = git.Clone(pkg.RemoteURL, pkg.FullPath)
 	if err != nil {
-		err = fmt.Errorf("gitInstall: %s", err)
-		return
+		return fmt.Errorf(`%s: %w`, logp, err)
 	}
 
 	var rev string
@@ -53,8 +54,7 @@ func (pkg *Package) gitInstall() (err error) {
 		} else {
 			rev, err = git.LatestCommit(pkg.FullPath, "")
 			if err != nil {
-				err = fmt.Errorf("gitInstall: %s", err)
-				return
+				return fmt.Errorf(`%s: %w`, logp, err)
 			}
 		}
 		pkg.Version = rev
@@ -63,7 +63,7 @@ func (pkg *Package) gitInstall() (err error) {
 	if len(pkg.RemoteBranch) == 0 {
 		err = pkg.gitGetBranch()
 		if err != nil {
-			return
+			return fmt.Errorf(`%s: %w`, logp, err)
 		}
 	}
 
@@ -71,8 +71,7 @@ func (pkg *Package) gitInstall() (err error) {
 		err = git.CheckoutRevision(pkg.FullPath, pkg.RemoteName,
 			pkg.RemoteBranch, pkg.Version)
 		if err != nil {
-			err = fmt.Errorf("gitInstall: %s", err)
-			return
+			return fmt.Errorf(`%s: %w`, logp, err)
 		}
 	}
 
diff --git a/package_test.go b/package_test.go
index 4bebe24..85253ca 100644
--- a/package_test.go
+++ b/package_test.go
@@ -37,9 +37,11 @@ func TestPackageRemove(t *testing.T) {
 			c.pkg, _ = NewPackage(testEnv.dirSrc, c.pkgName, c.pkgName)
 		}
 
-		err := c.pkg.Remove()
+		var err error
+
+		err = c.pkg.Remove()
 		if err != nil {
-			test.Assert(t, "err", c.expErr, err)
+			test.Assert(t, `error`, c.expErr, err.Error())
 			continue
 		}
 
@@ -81,7 +83,7 @@ func TestPackageInstall(t *testing.T) {
 	}, {
 		desc:   `Install again`,
 		pkg:    testGitPkgInstall,
-		expErr: "gitInstall: Clone: exit status 128",
+		expErr: `Install: gitInstall: Clone: exit status 128`,
 	}}
 
 	for _, c := range cases {
@@ -748,7 +750,7 @@ func TestPackageGoClean(t *testing.T) {
 
 		err = c.pkg.GoClean()
 		if err != nil {
-			test.Assert(t, "err", c.expErr, err)
+			test.Assert(t, `error`, c.expErr, err.Error())
 			continue
 		}