From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org>
Date: Fri, 15 Oct 2010 20:21:24 +0000 (+0200)
Subject: Fix some typos.
X-Git-Tag: v2.2_rc97~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0858261330bf818ac0ab5179cbca1b70e96b6b6c;p=portage.git

Fix some typos.
---

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 1a7dd7fbe..d9dbfb473 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -1181,7 +1181,7 @@ def calc_depclean(settings, trees, ldpath_mtimes,
 					raise AssertionError("no root nodes")
 				if ignore_priority is not None:
 					# Some deps have been dropped due to circular dependencies,
-					# so only pop one node in order do minimize the number that
+					# so only pop one node in order to minimize the number that
 					# are dropped.
 					del nodes[1:]
 				for node in nodes:
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index a8ea3c151..d05272f4f 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -4301,7 +4301,7 @@ class depgraph(object):
 						if min_parent_deps is not None and \
 							len(parent_deps) >= min_parent_deps:
 							# This task is no better than a previously selected
-							# task, so abort search now in order avoid wasting
+							# task, so abort search now in order to avoid wasting
 							# any more cpu time on this task. This increases
 							# performance dramatically in cases when there are
 							# hundreds of blockers to solve, like when
@@ -4323,7 +4323,7 @@ class depgraph(object):
 
 					if uninst_task is not None and min_parent_deps == 1:
 						# This is the best possible result, so so abort search
-						# now in order avoid wasting any more cpu time.
+						# now in order to avoid wasting any more cpu time.
 						break
 
 				if uninst_task is not None:
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index 60e94f0bd..303466597 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -419,7 +419,7 @@ def use_reduce(depstr, uselist=[], masklist=[], matchall=False, excludeall=[], i
 					return k>=0 and stack[k] and stack[k][0] == "||"
 
 				def last_any_of_operator_level(k):
-					#Returns the level of the last || operator if it is ineffect for
+					#Returns the level of the last || operator if it is in effect for
 					#the current level. It is not in effect, if there is a level, that
 					#ends in a non-operator. This is almost equivalent to stack[level][-1]=="||",
 					#expect that it skips empty levels.
diff --git a/pym/portage/exception.py b/pym/portage/exception.py
index e9e61e2ac..64d0f7b0d 100644
--- a/pym/portage/exception.py
+++ b/pym/portage/exception.py
@@ -151,7 +151,7 @@ class UnsupportedAPIException(PortagePackageException):
 		self.cpv, self.eapi = cpv, eapi
 	def __str__(self):
 		msg = _("Unable to do any operations on '%(cpv)s', since "
-		"it's EAPI is higher than this portage version's. Please upgrade"
+		"its EAPI is higher than this portage version's. Please upgrade"
 		" to a portage version that supports EAPI '%(eapi)s'.") % \
 		{"cpv": self.cpv, "eapi": str(self.eapi).lstrip("-")}
 		return msg
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 8330390e5..e50e6446a 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -1143,7 +1143,7 @@ class config(object):
 		if previous_features:
 			# The package from the previous setcpv call had package.env
 			# settings which modified FEATURES. Therefore, trigger a
-			# regenerate() call in order ensure that self.features
+			# regenerate() call in order to ensure that self.features
 			# is accurate.
 			has_changed = True