From: Sebastian Luther <SebastianLuther@gmx.de>
Date: Mon, 11 Oct 2010 16:28:20 +0000 (+0200)
Subject: slot collision handler: Prevent excessive running time
X-Git-Tag: v2.2_rc93~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7bdfab8c5e3ca4fb7c6c4dd0e97a9f19a087dc4b;p=portage.git

slot collision handler: Prevent excessive running time

The number of configurations to check grows exponentially in the number
of conflict_pkgs. To prevent excessive running times, only check the
"all-ebuild" configuration, if the number of conflict packages is
too large.
---

diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py
index 72075259f..78259a4f0 100644
--- a/pym/_emerge/resolver/slot_collision.py
+++ b/pym/_emerge/resolver/slot_collision.py
@@ -155,6 +155,15 @@ class slot_conflict_handler(object):
 					break
 			first_config = False
 
+			if len(conflict_pkgs) > 4:
+				# The number of configurations to check grows exponentially in the number of conflict_pkgs.
+				# To prevent excessive running times, only check the "all-ebuild" configuration,
+				# if the number of conflict packages is too large.
+				if self.debug:
+					writemsg("\nAborting search due to excessive number of configurations.\n", noiselevel=-1)
+				break
+
+
 	def get_conflict(self):
 		return "".join(self.conflict_msg)