fixes #1150

Note that this is a regression from #1087
AcademySoftwareFoundation · Dec 10, 2021 · 98113c1 · 98113c1
1 parent 42f8e04
commit 98113c1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/rez/solver.py b/src/rez/solver.py
@@ -1760,10 +1760,16 @@ def _add_reduct_node(request):
                     scope_r = scope_requests.get(scope_n)
 
                     if scope_n is not None \
+                            and scope_r is not None \
                             and scope_r.conflicts_with(conflicting_request):
                         # confirmed that scope node is in conflict
                         id1 = _add_request_node(conflicting_request)
                         id2 = scope_n
+                    elif scope_n is not None and scope_r is None:
+                        # occurs when an existing conflict request conflicts
+                        # with a pkg requirement
+                        id1 = scope_n
+                        id2 = _add_request_node(conflict.dependency)
                     else:
                         id1 = _add_request_node(conflict.dependency)
                         id2 = scope_n or _add_request_node(conflicting_request)

diff --git a/src/rez/utils/_version.py b/src/rez/utils/_version.py
@@ -14,4 +14,4 @@
 
 
 # Update this value to version up Rez. Do not place anything else in this file.
-_rez_version = "2.102.1"
+_rez_version = "2.103.0"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,4 @@


		# Update this value to version up Rez. Do not place anything else in this file.
		_rez_version = "2.102.1"
		_rez_version = "2.103.0"