summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-01-10 23:53:23 +0000
committerZac Medico <zmedico@gentoo.org>2007-01-10 23:53:23 +0000
commit204e04984f4f238e8991e025d50e95e69aed08f9 (patch)
treef16dd5d0d173d988b9e891f28c1f754c21cfee2b
parent0421f17a9f6bacf90210ee4fe14d63399cc5e968 (diff)
downloadportage-204e04984f4f238e8991e025d50e95e69aed08f9.tar.gz
portage-204e04984f4f238e8991e025d50e95e69aed08f9.tar.bz2
portage-204e04984f4f238e8991e025d50e95e69aed08f9.zip
Rename depgraph._invalid_depgraph_is_acceptable() to _accept_collisions() for a better description.
svn path=/main/trunk/; revision=5536
-rwxr-xr-xbin/emerge4
1 files changed, 2 insertions, 2 deletions
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: