From 659f06c0c9df8090ce2304f79ecd7ceb6cd31b49 Mon Sep 17 00:00:00 2001
From: Shulhan <ms@kilabit.info>
Date: Sat, 26 May 2018 17:12:46 +0700
Subject: Wrap println debug statements with Debug variable

---
 env.go         |  6 +++++-
 package.go     |  8 +++++---
 package_git.go | 36 +++++++++++++++++++++++++++---------
 3 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/env.go b/env.go
index a2a8a08..82ae075 100644
--- a/env.go
+++ b/env.go
@@ -572,6 +572,10 @@ func (env *Env) Save(file string) (err error) {
 
 	dir := filepath.Dir(file)
 
+	if Debug >= DebugL1 {
+		fmt.Println(">>> Save: MkdirAll:", dir)
+	}
+
 	err = os.MkdirAll(dir, 0700)
 	if err != nil {
 		return
@@ -701,7 +705,7 @@ func (env *Env) update(curPkg, newPkg *Package) (ok bool, err error) {
 //
 func (env *Env) updateMissing(newPkg *Package) {
 	var updated bool
-	fmt.Println(">>> Update missing ...")
+	fmt.Println(">>> Update missing:", newPkg.ImportPath)
 
 	for x := 0; x < len(env.pkgs); x++ {
 		updated = env.pkgs[x].UpdateMissingDep(newPkg)
diff --git a/package.go b/package.go
index e88ee6c..58107ea 100644
--- a/package.go
+++ b/package.go
@@ -222,7 +222,9 @@ func (pkg *Package) Scan() (err error) {
 // only external dependencies.
 //
 func (pkg *Package) ScanDeps(env *Env) (err error) {
-	fmt.Printf(">>> Scanning dependencies for %s ...\n", pkg.ImportPath)
+	if Debug >= DebugL1 {
+		fmt.Printf(">>> Scanning dependencies for %s ...\n", pkg.ImportPath)
+	}
 
 	imports, err := pkg.GetRecursiveImports()
 	if err != nil {
@@ -281,8 +283,8 @@ func (pkg *Package) GetRecursiveImports() (
 
 	sort.Strings(imports)
 
-	if Debug >= DebugL1 {
-		fmt.Println(">>> imports:", imports)
+	if Debug >= DebugL2 {
+		fmt.Println(">>> GetRecursiveImports: imports", imports)
 	}
 
 	return
diff --git a/package_git.go b/package_git.go
index c223960..a294226 100644
--- a/package_git.go
+++ b/package_git.go
@@ -16,7 +16,9 @@ import (
 func (pkg *Package) gitCheckoutVersion(version string) (err error) {
 	//nolint:gas
 	cmd := exec.Command("git", "checkout", "-q", version)
-	fmt.Println(">>>", cmd.Args)
+	if Debug >= DebugL1 {
+		fmt.Println(">>>", cmd.Args)
+	}
 	cmd.Dir = pkg.FullPath
 	cmd.Stdout = defStdout
 	cmd.Stderr = defStderr
@@ -69,7 +71,9 @@ func (pkg *Package) gitClone() (err error) {
 func (pkg *Package) gitCompareVersion(newPkg *Package) (err error) {
 	//nolint:gas
 	cmd := exec.Command("git", "log", "--oneline", pkg.Version+"..."+newPkg.Version)
-	fmt.Println(">>>", cmd.Args)
+	if Debug >= DebugL1 {
+		fmt.Println(">>>", cmd.Args)
+	}
 	cmd.Dir = pkg.FullPath
 	cmd.Stdout = defStdout
 	cmd.Stderr = defStderr
@@ -91,7 +95,9 @@ func (pkg *Package) gitCompareVersion(newPkg *Package) (err error) {
 func (pkg *Package) gitFetch() (err error) {
 	//nolint:gas
 	cmd := exec.Command("git", "fetch", "--all")
-	fmt.Println(">>>", cmd.Args)
+	if Debug >= DebugL1 {
+		fmt.Println(">>>", cmd.Args)
+	}
 	cmd.Dir = pkg.FullPath
 	cmd.Stdout = defStdout
 	cmd.Stderr = defStderr
@@ -119,7 +125,9 @@ func (pkg *Package) gitFetch() (err error) {
 func (pkg *Package) gitGetCommit(ref string) (commit string, err error) {
 	//nolint:gas
 	cmd := exec.Command("git", "rev-parse", "--short", ref)
-	fmt.Println(">>>", cmd.Args)
+	if Debug >= DebugL1 {
+		fmt.Println(">>>", cmd.Args)
+	}
 	cmd.Dir = pkg.FullPath
 
 	bcommit, err := cmd.Output()
@@ -139,7 +147,9 @@ func (pkg *Package) gitGetCommit(ref string) (commit string, err error) {
 func (pkg *Package) gitGetTag() (tag string, err error) {
 	//nolint:gas
 	cmd := exec.Command("git", "describe", "--tags", "--exact-match")
-	fmt.Println(">>>", cmd.Args)
+	if Debug >= DebugL1 {
+		fmt.Println(">>>", cmd.Args)
+	}
 	cmd.Dir = pkg.FullPath
 
 	btag, err := cmd.Output()
@@ -156,7 +166,9 @@ func (pkg *Package) gitGetTag() (tag string, err error) {
 func (pkg *Package) gitGetTagLatest() (tag string, err error) {
 	//nolint:gas
 	cmd := exec.Command("git", "rev-list", "--tags", "--max-count=1")
-	fmt.Println(">>>", cmd.Args)
+	if Debug >= DebugL1 {
+		fmt.Println(">>>", cmd.Args)
+	}
 	cmd.Dir = pkg.FullPath
 
 	bout, err := cmd.Output()
@@ -169,7 +181,9 @@ func (pkg *Package) gitGetTagLatest() (tag string, err error) {
 
 	//nolint:gas
 	cmd = exec.Command("git", "describe", "--tags", "--abbrev=0", out)
-	fmt.Println(">>>", cmd.Args)
+	if Debug >= DebugL1 {
+		fmt.Println(">>>", cmd.Args)
+	}
 	cmd.Dir = pkg.FullPath
 
 	bout, err = cmd.Output()
@@ -226,7 +240,9 @@ func (pkg *Package) gitInstall() (err error) {
 func (pkg *Package) gitRemoteChange(newPkg *Package) (err error) {
 	//nolint:gas
 	cmd := exec.Command("git", "remote", "remove", pkg.RemoteName)
-	fmt.Println(">>>", cmd.Args)
+	if Debug >= DebugL1 {
+		fmt.Println(">>>", cmd.Args)
+	}
 	cmd.Dir = pkg.FullPath
 	cmd.Stdout = defStdout
 	cmd.Stderr = defStderr
@@ -238,7 +254,9 @@ func (pkg *Package) gitRemoteChange(newPkg *Package) (err error) {
 
 	//nolint:gas
 	cmd = exec.Command("git", "remote", "add", newPkg.RemoteName, newPkg.RemoteURL)
-	fmt.Println(">>>", cmd.Args)
+	if Debug >= DebugL1 {
+		fmt.Println(">>>", cmd.Args)
+	}
 	cmd.Dir = pkg.FullPath
 	cmd.Stdout = defStdout
 	cmd.Stderr = defStderr
-- 
cgit v1.3