From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 10 Jan 2007 23:53:23 +0000 (-0000)
Subject: Rename depgraph._invalid_depgraph_is_acceptable() to _accept_collisions() for a bette... 
X-Git-Tag: v2.1.2~95
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=204e04984f4f238e8991e025d50e95e69aed08f9;p=portage.git

Rename depgraph._invalid_depgraph_is_acceptable() to _accept_collisions() for a better description.

svn path=/main/trunk/; revision=5536
---

diff --git a/bin/emerge b/bin/emerge
index c7c43f4bd..03f6d93b0 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1939,11 +1939,11 @@ class depgraph:
 				if x[0] == "blocks":
 					return True
 			self._show_slot_collision_notice(self._slot_collision_info[0])
-			if not self._invalid_depgraph_is_acceptable():
+			if not self._accept_collisions():
 				return False
 		return True
 
-	def _invalid_depgraph_is_acceptable(self):
+	def _accept_collisions(self):
 		acceptable = False
 		for x in ("--nodeps", "--pretend", "--fetchonly", "--fetch-all-uri"):
 			if x in self.myopts: