Merge pull request #1478 from carolynvs/apply-prune-on-init

carolynvs · web-flow · commit 9815e4a544b3 · 2017-12-24T13:00:17.000-06:00
cmd/dep: apply default prune options on init
diff --git a/cmd/dep/init.go b/cmd/dep/init.go
@@ -214,7 +214,7 @@ func (cmd *initCommand) Run(ctx *dep.Ctx, args []string) error {
 		ctx.Err.Printf("Old vendor backed up to %v", vendorbak)
 	}
 
-	sw, err := dep.NewSafeWriter(p.Manifest, nil, p.Lock, dep.VendorAlways, gps.DefaultRootPruneOptions())
+	sw, err := dep.NewSafeWriter(p.Manifest, nil, p.Lock, dep.VendorAlways, p.Manifest.PruneOptions)
 	if err != nil {
 		return errors.Wrap(err, "init failed: unable to create a SafeWriter")
 	}

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ func (cmd initCommand) Run(ctx dep.Ctx, args []string) error {`
`214`	`214`	`ctx.Err.Printf("Old vendor backed up to %v", vendorbak)`
`215`	`215`	`}`
`216`	`216`
`217`		`- sw, err := dep.NewSafeWriter(p.Manifest, nil, p.Lock, dep.VendorAlways, gps.DefaultRootPruneOptions())`
	`217`	`+ sw, err := dep.NewSafeWriter(p.Manifest, nil, p.Lock, dep.VendorAlways, p.Manifest.PruneOptions)`
`218`	`218`	`if err != nil {`
`219`	`219`	`return errors.Wrap(err, "init failed: unable to create a SafeWriter")`
`220`	`220`	`}`