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

Commit 4603971

Browse files
committed
use new manifest constructor and making requested changes
1 parent 5a5aaf2 commit 4603971

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

cmd/dep/govend_importer.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,7 @@ func (g *govendImporter) load(projectDir string) error {
9191
func (g *govendImporter) convert(pr gps.ProjectRoot) (*dep.Manifest, *dep.Lock, error) {
9292
g.logger.Println("Converting from vendor.yaml...")
9393

94-
manifest := &dep.Manifest{
95-
Constraints: make(gps.ProjectConstraints),
96-
}
94+
manifest := dep.NewManifest()
9795
lock := &dep.Lock{}
9896

9997
for _, pkg := range g.yaml.Imports {

cmd/dep/govend_importer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func TestGovendConfig_Import(t *testing.T) {
108108
// Disable verbose so that we don't print values that change each test run
109109
g := newGovendImporter(logger, false, sm)
110110
if !g.HasDepMetadata(projectRoot) {
111-
t.Fatal("Expected the importer to detect godep configuration file")
111+
t.Fatal("Expected the importer to detect govend configuration file")
112112
}
113113

114114
m, l, err := g.Import(projectRoot, testProjectRoot)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
"github.com/sdboyer/deptest",
1111
"github.com/sdboyer/deptestdos"
1212
]
13-
}
13+
}

0 commit comments

Comments
 (0)