gps: check wildcard ignored and required conflict

internal/gps/solver.go

@@ -206,10 +206,13 @@ func (params SolveParameters) toRootdata() (rootdata, error) {
 		rd.ovr = make(ProjectConstraints)
 	}
 
+	// Create ignore prefix tree using the provided ignore packages
+	rd.igpfx = pkgtree.CreateIgnorePrefixTree(rd.ig)
+
 	if len(rd.ig) != 0 {
 		var both []string
 		for pkg := range params.Manifest.RequiredPackages() {
-			if rd.ig[pkg] {
+			if rd.isIgnored(pkg) {
 				both = append(both, pkg)
 			}
 		}
@@ -262,9 +265,6 @@ func (params SolveParameters) toRootdata() (rootdata, error) {
 		rd.chng[p] = struct{}{}
 	}
 
-	// Create ignore prefix tree using the provided ignore packages
-	rd.igpfx = pkgtree.CreateIgnorePrefixTree(rd.ig)
-
 	return rd, nil
 }
 

internal/gps/solver_inputs_test.go

@@ -114,6 +114,17 @@ func TestBadSolveOpts(t *testing.T) {
 	} else if !strings.Contains(err.Error(), "multiple packages given as both required and ignored:") {
 		t.Error("Prepare should have given error with multiple ignore/require conflict error, but gave:", err)
 	}
+
+	params.Manifest = simpleRootManifest{
+		ig:  map[string]bool{"foo*": true},
+		req: map[string]bool{"foo/bar": true},
+	}
+	_, err = Prepare(params, sm)
+	if err == nil {
+		t.Errorf("Should have errored on pkg both ignored (with wildcard) and required")
+	} else if !strings.Contains(err.Error(), "was given as both a required and ignored package") {
+		t.Error("Prepare should have given error with single ignore/require conflict error, but gave:", err)
+	}
 	params.Manifest = nil
 
 	params.ToChange = []ProjectRoot{"foo"}