dep: update calculatePrune to not assume "/" as separtor

dep.calculatePrune assumes "/" is the file separtor. This change fixes an issue caused by that on Windows. Fixes #775 Signed-off-by: Ibrahim AshShohail <[email protected]>
golang · Jun 21, 2017 · a9cd3d8 · a9cd3d8
1 parent 0584d8c
commit a9cd3d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/txn_writer.go b/txn_writer.go
@@ -530,6 +530,7 @@ fail:
 	return failerr
 }
 
+// calculatePrune returns the paths of the packages to be deleted from vendorDir.
 func calculatePrune(vendorDir string, keep []string, logger *log.Logger) ([]string, error) {
 	if logger != nil {
 		logger.Println("Calculating prune. Checking the following packages:")
@@ -547,7 +548,7 @@ func calculatePrune(vendorDir string, keep []string, logger *log.Logger) ([]stri
 			return nil
 		}
 
-		name := strings.TrimPrefix(path, vendorDir+"/")
+		name := strings.TrimPrefix(path, vendorDir+string(filepath.Separator))
 		if logger != nil {
 			logger.Printf("  %s", name)
 		}

diff --git a/txn_writer_test.go b/txn_writer_test.go
@@ -601,6 +601,6 @@ func TestCalculatePrune(t *testing.T) {
 	}
 
 	if !reflect.DeepEqual(want, got) {
-		t.Fatalf("expect %s, got %s", want, got)
+		t.Fatalf("expected %s, got %s", want, got)
 	}
 }