Rename slot-abi stuff to refer to slot-operator.

This makes it consistent with the language in the PMS eapi-5 branch:
http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=5d6749ac9e5ddc5b1daaad7737b65fa81c6ece47

2 files changed, 10 insertions, 10 deletions

diff --git a/pym/_emerge/resolver/backtracking.py b/pym/_emerge/resolver/backtracking.py
index d8f49c679..5456ea455 100644
--- a/pym/_emerge/resolver/backtracking.py
+++ b/pym/_emerge/resolver/backtracking.py
@@ -8,7 +8,7 @@ class BacktrackParameter(object):
 	__slots__ = (
 		"needed_unstable_keywords", "runtime_pkg_mask", "needed_use_config_changes", "needed_license_changes",
 		"rebuild_list", "reinstall_list", "needed_p_mask_changes",
-		"slot_abi_replace_installed"
+		"slot_operator_replace_installed"
 	)
 
 	def __init__(self):
@@ -19,7 +19,7 @@ class BacktrackParameter(object):
 		self.needed_license_changes = {}
 		self.rebuild_list = set()
 		self.reinstall_list = set()
-		self.slot_abi_replace_installed = set()
+		self.slot_operator_replace_installed = set()
 
 	def __deepcopy__(self, memo=None):
 		if memo is None:
@@ -35,7 +35,7 @@ class BacktrackParameter(object):
 		result.needed_license_changes = copy.copy(self.needed_license_changes)
 		result.rebuild_list = copy.copy(self.rebuild_list)
 		result.reinstall_list = copy.copy(self.reinstall_list)
-		result.slot_abi_replace_installed = copy.copy(self.slot_abi_replace_installed)
+		result.slot_operator_replace_installed = copy.copy(self.slot_operator_replace_installed)
 
 		# runtime_pkg_mask contains nested dicts that must also be copied
 		result.runtime_pkg_mask = {}
@@ -52,7 +52,7 @@ class BacktrackParameter(object):
 			self.needed_license_changes == other.needed_license_changes and \
 			self.rebuild_list == other.rebuild_list and \
 			self.reinstall_list == other.reinstall_list and \
-			self.slot_abi_replace_installed == other.slot_abi_replace_installed
+			self.slot_operator_replace_installed == other.slot_operator_replace_installed
 
 
 class _BacktrackNode(object):
@@ -125,7 +125,7 @@ class Backtracker(object):
 		for pkg, mask_info in runtime_pkg_mask.items():
 
 			if "missing dependency" in mask_info or \
-				"slot_abi_mask_built" in mask_info:
+				"slot_operator_mask_built" in mask_info:
 				continue
 
 			entry_is_valid = False
@@ -192,12 +192,12 @@ class Backtracker(object):
 					para.needed_use_config_changes[pkg] = (new_use, new_changes)
 			elif change == "slot_conflict_abi":
 				new_node.terminal = False
-			elif change == "slot_abi_mask_built":
+			elif change == "slot_operator_mask_built":
 				for pkg, mask_reasons in data.items():
 					para.runtime_pkg_mask.setdefault(pkg,
 						{}).update(mask_reasons)
-			elif change == "slot_abi_replace_installed":
-				para.slot_abi_replace_installed.update(data)
+			elif change == "slot_operator_replace_installed":
+				para.slot_operator_replace_installed.update(data)
 			elif change == "rebuild_list":
 				para.rebuild_list.update(data)
 			elif change == "reinstall_list":
diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py
index 783a6483d..bc95e916e 100644
--- a/pym/_emerge/resolver/slot_collision.py
+++ b/pym/_emerge/resolver/slot_collision.py
@@ -291,8 +291,8 @@ class slot_conflict_handler(object):
 									num_all_specific_atoms += 1
 									collision_reasons[key] = atoms
 								else:
-									# The slot_abi does not match.
-									key = ("sub-slot", atom.slot_abi)
+									# The sub_slot does not match.
+									key = ("sub-slot", atom.sub_slot)
 									atoms = collision_reasons.get(key, set())
 									atoms.add((ppkg, atom, other_pkg))
 									num_all_specific_atoms += 1