From 31f859061535ae35f88d92cdb3bb7a6093e61685 Mon Sep 17 00:00:00 2001
From: sam boyer <tech@samboyer.org>
Date: Thu, 19 Jan 2017 09:39:28 -0500
Subject: [PATCH] Update LocalImportsError to suit

---
 analysis.go      | 12 ++++++++++--
 analysis_test.go | 10 ++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/analysis.go b/analysis.go
index 4cb2ebd..1c84104 100644
--- a/analysis.go
+++ b/analysis.go
@@ -167,7 +167,7 @@ func ListPackages(fileRoot, importRoot string) (PackageTree, error) {
 		if len(lim) > 0 {
 			ptree.Packages[ip] = PackageOrErr{
 				Err: &LocalImportsError{
-					Dir:          path,
+					Dir:          wp,
 					ImportPath:   ip,
 					LocalImports: lim,
 				},
@@ -290,7 +290,15 @@ type LocalImportsError struct {
 }
 
 func (e *LocalImportsError) Error() string {
-	return fmt.Sprintf("import path %s had problematic local imports", e.Dir)
+	switch len(e.LocalImports) {
+	case 0:
+		// shouldn't be possible, but just cover the case
+		return fmt.Sprintf("import path %s had bad local imports", e.ImportPath)
+	case 1:
+		return fmt.Sprintf("import path %s had a local import: %q", e.ImportPath, e.LocalImports[0])
+	default:
+		return fmt.Sprintf("import path %s had local imports: %q", e.ImportPath, strings.Join(e.LocalImports, "\", \""))
+	}
 }
 
 // A PackageTree represents the results of recursively parsing a tree of
diff --git a/analysis_test.go b/analysis_test.go
index 1a0f437..8b381b6 100644
--- a/analysis_test.go
+++ b/analysis_test.go
@@ -1391,8 +1391,14 @@ func TestExternalReachCycle(t *testing.T) {
 	}
 
 	rm := ptree.ExternalReach(true, true, nil)
-	if len(rm) > 0 {
-		t.Errorf("should be empty reachmap when all packages are in a cycle, got %v", rm)
+
+	// TEMPORARILY COMMENTED UNTIL WE CREATE A BETTER LISTPACKAGES MODEL -
+	//if len(rm) > 0 {
+	//t.Errorf("should be empty reachmap when all packages are in a cycle, got %v", rm)
+	//}
+
+	if len(rm) == 0 {
+		t.Error("TEMPORARY: should ignore import cycles, but cycle was eliminated")
 	}
 }