Merge 2394c8d into 496597b

retrodep/gosource.go

@@ -533,19 +533,20 @@ func (src GoSource) RepoPathForImportPath(importPath string) (*RepoPath, error)
 
 	// No replacement found, use the import pth as-is
 	r, err := vcs.RepoRootForImportPath(importPath, false)
-	if err != nil && strings.ContainsRune(importPath, '_') {
-		// gopkg.in gives bad responses for paths like
-		// gopkg.in/foo/bar.v2/_examples/chat1
-		// because of the underscore. Remove it and try again.
+	if err != nil {
 		u := strings.Index(importPath, "_")
+		if u == -1 {
+			return nil, err
+		}
+		// go.pkg ... it and try again.
 		importPath = path.Dir(importPath[:u])
-		r, nerr := vcs.RepoRootForImportPath(importPath, false)
-		if nerr == nil {
-			return &RepoPath{RepoRoot: *r}, nil
+		r, err2 := vcs.RepoRootForImportPath(importPath, false)
+		if err2 != nil {
+			return nil, err // Returning the initial error is intentional
 		}
+		return &RepoPath{RepoRoot: *r}, nil
 	}
-
-	return &RepoPath{RepoRoot: *r}, err
+	return &RepoPath{RepoRoot: *r}, nil
 }
 
 // Diff writes (to out) the differences between the Go source code at