Fix some typos.

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 708ff0ff5fa4cd62f5ca297fbac946b1025391a6..4f1243c237419838d3536efdf681cfd4b17e85e6 100644 (file)
--- 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 38d2d4029bfcd960bb9da001a920b76e7acb3a83..365efe6dc5e6a926a77027004372a80c3b4b6c6a 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -4255,7 +4255,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
@@ -4277,7 +4277,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 60e94f0bdc5445c6f20b122f4ad0163e73dc8be3..30346659797a2e1f65ea30a29d0fd351ac342a4b 100644 (file)
--- 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 e9e61e2acf4cf343f8919a1e2642f2662c44418c..64d0f7b0db334c38bd39ad56c129696599e7d5ae 100644 (file)
--- 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 aa8d3c0a16cbd08e27d21dc7693874befbf96759..0023b3f6838bd2b9ea9bf40813cca0ef74450b33 100644 (file)
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -1189,7 +1189,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