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

Commit 7c5da12

Browse files
committed
status: use IgnoredPackages() to get all packages
This change removes the usage of IgnoredPackages() separately and passes the same to ToReachMap(), which returns the packages with all ignoring rules applied.
1 parent f5750a7 commit 7c5da12

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

cmd/dep/status.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ func runStatusAll(ctx *dep.Ctx, out outputter, p *dep.Project, sm gps.SourceMana
566566
//
567567
// It's possible for digests to not match, but still have a correct
568568
// lock.
569-
rm, _ := ptree.ToReachMap(true, true, false, nil)
569+
rm, _ := ptree.ToReachMap(true, true, false, p.Manifest.IgnoredPackages())
570570

571571
external := rm.FlattenFn(paths.IsStandardImportPath)
572572
roots := make(map[gps.ProjectRoot][]string, len(external))
@@ -603,9 +603,6 @@ func runStatusAll(ctx *dep.Ctx, out outputter, p *dep.Project, sm gps.SourceMana
603603

604604
out.MissingHeader()
605605

606-
// Ignored packages.
607-
igPkgs := p.Manifest.IgnoredPackages()
608-
609606
outer:
610607
for root, pkgs := range roots {
611608
// TODO also handle the case where the project is present, but there
@@ -616,10 +613,6 @@ outer:
616613
}
617614
}
618615

619-
if _, ok := igPkgs[string(root)]; ok {
620-
continue outer
621-
}
622-
623616
hasMissingPkgs = true
624617
out.MissingLine(&MissingStatus{ProjectRoot: string(root), MissingPackages: pkgs})
625618
}

0 commit comments

Comments
 (0)