From 0160c5b490bc3d027e8cf8522de554ad33e6623c Mon Sep 17 00:00:00 2001 From: Sunny Date: Wed, 4 Oct 2017 18:15:05 +0530 Subject: [PATCH 1/2] fix(status): check lockfile before runStatusAll() --- cmd/dep/status.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/dep/status.go b/cmd/dep/status.go index de1279137e..e2ece9fad3 100644 --- a/cmd/dep/status.go +++ b/cmd/dep/status.go @@ -236,6 +236,11 @@ func (cmd *statusCommand) Run(ctx *dep.Ctx, args []string) error { } } + // Check if the lock file exists. + if p.Lock == nil { + return errors.Errorf("no Gopkg.lock found. Run `dep ensure` to generate lock file") + } + hasMissingPkgs, errCount, err := runStatusAll(ctx, out, p, sm) if err != nil { switch err { @@ -353,10 +358,6 @@ type MissingStatus struct { } func runStatusAll(ctx *dep.Ctx, out outputter, p *dep.Project, sm gps.SourceManager) (hasMissingPkgs bool, errCount int, err error) { - if p.Lock == nil { - return false, 0, errors.Errorf("no Gopkg.lock found. Run `dep ensure` to generate lock file") - } - // While the network churns on ListVersions() requests, statically analyze // code from the current project. ptree, err := pkgtree.ListPackages(p.ResolvedAbsRoot, string(p.ImportRoot)) From 365e4ee05c99258d2fa08574582ea13db83ffadb Mon Sep 17 00:00:00 2001 From: Sunny Date: Wed, 4 Oct 2017 22:02:06 +0530 Subject: [PATCH 2/2] status: do not suggest -v for uncategorized error --- cmd/dep/status.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmd/dep/status.go b/cmd/dep/status.go index e2ece9fad3..93b1e73a10 100644 --- a/cmd/dep/status.go +++ b/cmd/dep/status.go @@ -261,8 +261,6 @@ func (cmd *statusCommand) Run(ctx *dep.Ctx, args []string) error { ctx.Err.Printf("Lock inputs-digest mismatch. This happens when Gopkg.toml is modified.\n" + "Run `dep ensure` to regenerate the inputs-digest.") } - default: - ctx.Out.Println("Failed to get status. Rerun with `-v` flag to see details.") } return err