refactor: rename for name clarity

metrumresearchgroup · Mar 14, 2020 · 320a2a7 · 320a2a7
1 parent 15cf6d2
commit 320a2a7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/gpsr/dependencies.go b/gpsr/dependencies.go
@@ -58,7 +58,7 @@ func ResolveLayers(graph Graph, noRecommended bool) ([][]string, error) {
 
 		dependencySet := mapset.NewSet()
 		for _, dep := range node.Deps {
-			if !isDefaultPackage(dep, noRecommended) {
+			if !isExcludedPackage(dep, noRecommended) {
 				dependencySet.Add(dep)
 			}
 		}

diff --git a/gpsr/helpers.go b/gpsr/helpers.go
@@ -6,7 +6,7 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-func isDefaultPackage(pkg string, noRecommended bool) bool {
+func isExcludedPackage(pkg string, noRecommended bool) bool {
 	pkgType, exists := DefaultPackages[pkg]
 	if exists && !noRecommended && pkgType == "recommended" {
 		return false
@@ -24,7 +24,7 @@ func appendToGraph(m Graph, d desc.Desc, dependencyConfigs InstallDeps, pkgNexus
 	if dependencyConfig.Depends {
 		for r := range d.Depends {
 			_, _, ok := pkgNexus.GetPackage(r)
-			if ok && !isDefaultPackage(r, dependencyConfig.NoRecommended) {
+			if ok && !isExcludedPackage(r, dependencyConfig.NoRecommended) {
 				reqs = append(reqs, r)
 			} else {
 				log.WithField("pkg", d.Package).WithField("dep", r).Trace("skipping Depends dep")
@@ -34,7 +34,7 @@ func appendToGraph(m Graph, d desc.Desc, dependencyConfigs InstallDeps, pkgNexus
 	if dependencyConfig.Imports {
 		for r := range d.Imports {
 			_, _, ok := pkgNexus.GetPackage(r)
-			if ok && !isDefaultPackage(r, dependencyConfig.NoRecommended) {
+			if ok && !isExcludedPackage(r, dependencyConfig.NoRecommended) {
 				reqs = append(reqs, r)
 			} else {
 				log.WithField("pkg", d.Package).WithField("dep", r).Trace("skipping Imports dep")
@@ -44,7 +44,7 @@ func appendToGraph(m Graph, d desc.Desc, dependencyConfigs InstallDeps, pkgNexus
 	if dependencyConfig.LinkingTo {
 		for r := range d.LinkingTo {
 			_, _, ok := pkgNexus.GetPackage(r)
-			if ok && !isDefaultPackage(r, dependencyConfig.NoRecommended) {
+			if ok && !isExcludedPackage(r, dependencyConfig.NoRecommended) {
 				reqs = append(reqs, r)
 			} else {
 				log.WithField("pkg", d.Package).WithField("dep", r).Trace("skipping LinkingTo dep")