Other nits to get it testing and compiling
Not actually clear if this is fully correct or not, but it does compile
and pass tests.
diff --git a/action/get.go b/action/get.go
index 7d27a7a..d0f872b 100644
--- a/action/get.go
+++ b/action/get.go
@@ -40,7 +40,7 @@
rd := filepath.Dir(glidefile)
rt, err := gps.ListPackages(rd, conf.Name)
if err != nil {
- msg.Die("Error while scanning project: %s", err)
+ msg.Die("Error while scanning project imports: %s", err)
}
params := gps.SolveParameters{
@@ -57,7 +57,7 @@
if gpath.HasLock(base) {
params.Lock, _, err = loadLockfile(base, conf)
if err != nil {
- msg.Err("Could not load lockfile; aborting get. Existing dependency versions cannot be safely preserved without a lock file. Error was: %s", err)
+ msg.Err("Could not load lockfile; aborting get. Other dependency versions cannot be preserved without an invalid lock file . Error was: %s", err)
return
}
}
@@ -112,7 +112,6 @@
err = gw.writeAllSafe()
if err != nil {
msg.Err(err.Error())
- return
}
}
diff --git a/glide.go b/glide.go
index b7b2260..899ab1c 100644
--- a/glide.go
+++ b/glide.go
@@ -255,8 +255,8 @@
- No updates are peformed. You may want to run 'glide up' to accomplish that.`,
Flags: []cli.Flag{
cli.BoolFlag{
- Name: "delete,d",
- Usage: "Also delete from vendor/ any packages that are no longer used.",
+ Name: "strip-vendor, v",
+ Usage: "Removes nested vendor and Godeps/_workspace directories. Requires --strip-vcs.",
},
},
Action: func(c *cli.Context) {
@@ -265,14 +265,10 @@
os.Exit(1)
}
- if c.Bool("delete") {
- // FIXME: Implement this in the installer.
- fmt.Println("Delete is not currently implemented.")
- }
inst := repo.NewInstaller()
inst.Force = c.Bool("force")
packages := []string(c.Args())
- action.Remove(packages, inst)
+ action.Remove(packages, inst, c.Bool("strip-vendor"))
},
},
{
@@ -589,7 +585,6 @@
// so it can be used by any Glide command.
func startup(c *cli.Context) error {
action.Debug(c.Bool("debug"))
- action.Verbose(c.Bool("verbose"))
action.NoColor(c.Bool("no-color"))
action.Quiet(c.Bool("quiet"))
action.Init(c.String("yaml"), c.String("home"))
