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

Commit 857a410

Browse files
authored
Merge pull request #889 from bradleyfalzon/ensure-always-vendor
ensure: always write vendor even if not empty
2 parents cf81674 + 1aa2730 commit 857a410

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

cmd/dep/ensure.go

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ import (
1010
"fmt"
1111
"go/build"
1212
"log"
13-
"path/filepath"
1413
"strings"
1514

1615
"github.com/golang/dep"
17-
"github.com/golang/dep/internal/fs"
1816
"github.com/golang/dep/internal/gps"
1917
"github.com/golang/dep/internal/gps/pkgtree"
2018
"github.com/pkg/errors"
@@ -151,19 +149,8 @@ func (cmd *ensureCommand) Run(ctx *dep.Ctx, args []string) error {
151149
return errors.Wrap(err, "ensure Solve()")
152150
}
153151

154-
// check if vendor exists, because if the locks are the same but
155-
// vendor does not exist we should write vendor
156-
vendorExists, err := fs.IsNonEmptyDir(filepath.Join(p.AbsRoot, "vendor"))
157-
if err != nil {
158-
return errors.Wrap(err, "ensure vendor is a directory")
159-
}
160-
writeV := dep.VendorOnChanged
161-
if !vendorExists && solution != nil {
162-
writeV = dep.VendorAlways
163-
}
164-
165152
newLock := dep.LockFromSolution(solution)
166-
sw, err := dep.NewSafeWriter(nil, p.Lock, newLock, writeV)
153+
sw, err := dep.NewSafeWriter(nil, p.Lock, newLock, dep.VendorAlways)
167154
if err != nil {
168155
return err
169156
}

0 commit comments

Comments
 (0)