Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

Commit 0921762

Browse files
committed
Do not import vendored sources
1 parent 152da47 commit 0921762

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

internal/importers/base/importer.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package base
66

77
import (
88
"log"
9+
"strings"
910

1011
"github.com/golang/dep"
1112
fb "github.com/golang/dep/internal/feedback"
@@ -187,6 +188,9 @@ func (i *Importer) ImportPackages(packages []ImportedPackage, defaultConstraintF
187188
source = ""
188189
} else if isDefault {
189190
source = ""
191+
} else if strings.Contains(source, "/vendor/") {
192+
i.Logger.Printf(" Ignoring imported source %s for %s because vendored sources aren't supported", source, prj.Root)
193+
source = ""
190194
}
191195
}
192196

internal/importers/base/importer_test.go

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ func TestBaseImporter_ImportProjects(t *testing.T) {
382382
},
383383
},
384384
},
385-
"ignoring default source": {
385+
"ignore default source": {
386386
importertest.TestCase{
387387
WantConstraint: "*",
388388
WantSourceRepo: "",
@@ -394,6 +394,19 @@ func TestBaseImporter_ImportProjects(t *testing.T) {
394394
},
395395
},
396396
},
397+
"ignore vendored source": {
398+
importertest.TestCase{
399+
WantConstraint: "*",
400+
WantSourceRepo: "",
401+
WantWarning: "vendored sources aren't supported",
402+
},
403+
[]ImportedPackage{
404+
{
405+
Name: importertest.Project,
406+
Source: "example.com/vendor/" + importertest.Project,
407+
},
408+
},
409+
},
397410
}
398411

399412
for name, tc := range testcases {

0 commit comments

Comments
 (0)