Ignore gopath and existing tools in network mode

Author: darkowlzz

cmd/dep/init.go

@@ -121,29 +121,52 @@ func (cmd *initCommand) Run(ctx *dep.Ctx, args []string) error {
 	sm.UseDefaultSignalHandling()
 	defer sm.Release()
 
-	// Initialize with imported data, then fill in the gaps using the GOPATH
-	rootAnalyzer := newRootAnalyzer(cmd.skipTools, ctx, directDeps, sm)
-	m, l, err := rootAnalyzer.InitializeRootManifestAndLock(root, gps.ProjectRoot(cpr))
-	if err != nil {
-		return err
+	// Create empty manifest and lock
+	m := &dep.Manifest{
+		Constraints: make(gps.ProjectConstraints),
+		Ovr:         make(gps.ProjectConstraints),
 	}
+	l := &dep.Lock{}
 
+	// Initialize rootAnalyzer and gopathScanner
+	rootAnalyzer := newRootAnalyzer(cmd.skipTools, ctx, directDeps, sm)
 	gs := newGopathScanner(ctx, directDeps, sm)
+
+	params := gps.SolveParameters{}
+
 	if cmd.gopath {
+		// Initialize with imported data, then fill in the gaps using the GOPATH
+		im, il, err := rootAnalyzer.InitializeRootManifestAndLock(root, gps.ProjectRoot(cpr))
+		if err != nil {
+			return err
+		}
+
+		if im != nil {
+			m = im
+		}
+		if il != nil {
+			l = il
+		}
+
 		err = gs.InitializeRootManifestAndLock(m, l)
 		if err != nil {
 			return err
 		}
-	}
 
-	rootAnalyzer.skipTools = true // Don't import external config during solve for now
+		rootAnalyzer.skipTools = true // Don't import external config during solve for now
+	}
 
-	params := gps.SolveParameters{
+	params = gps.SolveParameters{
 		RootDir:         root,
 		RootPackageTree: pkgT,
 		Manifest:        m,
 		Lock:            l,
-		ProjectAnalyzer: rootAnalyzer,
+	}
+
+	if cmd.gopath {
+		params.ProjectAnalyzer = rootAnalyzer
+	} else {
+		params.ProjectAnalyzer = dep.Analyzer{}
 	}
 
 	if ctx.Verbose {
@@ -162,8 +185,8 @@ func (cmd *initCommand) Run(ctx *dep.Ctx, args []string) error {
 	}
 	l = dep.LockFromSolution(soln)
 
-	rootAnalyzer.FinalizeRootManifestAndLock(m, l)
 	if cmd.gopath {
+		rootAnalyzer.FinalizeRootManifestAndLock(m, l)
 		gs.FinalizeRootManifestAndLock(m, l)
 	} else {
 		// Pick the direct dependencies from the above solution and add to manifest

cmd/dep/root_analyzer.go

@@ -52,16 +52,6 @@ func (a *rootAnalyzer) InitializeRootManifestAndLock(dir string, pr gps.ProjectR
 		}
 	}
 
-	if rootM == nil {
-		rootM = &dep.Manifest{
-			Constraints: make(gps.ProjectConstraints),
-			Ovr:         make(gps.ProjectConstraints),
-		}
-	}
-	if rootL == nil {
-		rootL = &dep.Lock{}
-	}
-
 	return
 }
 

cmd/dep/testdata/harness_tests/init/glide/case1/testcase.json

@@ -1,6 +1,6 @@
 {
   "commands": [
-    ["init", "-no-examples"]
+    ["init", "-no-examples", "-gopath"]
   ],
   "error-expected": "",
   "gopath-initial": {