Fix some typos.

diff --git a/bin/egencache b/bin/egencache
index 408aec88a06d1b6733f26f370edb9691afad9f1b..9b22363f061c9a61182224badfffd3dcd3885b5e 100755 (executable)
--- a/bin/egencache
+++ b/bin/egencache
@@ -137,7 +137,7 @@ def parse_args(args):
                help="do not use the EGENCACHE_DEFAULT_OPTS environment variable")
        common.add_argument("--write-timestamp",
                action="store_true",
-               help="write metdata/timestamp.chk as required for rsync repositories")
+               help="write metadata/timestamp.chk as required for rsync repositories")
 
        update = parser.add_argument_group('--update options')
        update.add_argument("--cache-dir",

diff --git a/pym/_emerge/BlockerCache.py b/pym/_emerge/BlockerCache.py
index 91955249b81e173f4442fac6609c642a12cef2e8..53342d6d6f9f221fb69fbf85dbdd2fcaaff2424d 100644 (file)
--- a/pym/_emerge/BlockerCache.py
+++ b/pym/_emerge/BlockerCache.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 import errno
@@ -128,9 +128,9 @@ class BlockerCache(portage.cache.mappings.MutableMapping):
                self._modified.clear()
 
        def flush(self):
-               """If the current user has permission and the internal blocker cache
+               """If the current user has permission and the internal blocker cache has
                been updated, save it to disk and mark it unmodified.  This is called
-               by emerge after it has proccessed blockers for all installed packages.
+               by emerge after it has processed blockers for all installed packages.
                Currently, the cache is only written if the user has superuser
                privileges (since that's required to obtain a lock), but all users
                have read access and benefit from faster blocker lookups (as long as

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 343cc032ad017f8bc6a94cfcbf2e0e3852e89dcf..65b87d6c23a66db5036d14afd6c7d9cbcb2ffe90 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2269,7 +2269,7 @@ class depgraph(object):
        def _ignore_dependency(self, atom, pkg, child, dep, mypriority, recurse_satisfied):
                """
                In some cases, dep_check will return deps that shouldn't
-               be proccessed any further, so they are identified and
+               be processed any further, so they are identified and
                discarded here. Try to discard as few as possible since
                discarded dependencies reduce the amount of information
                available for optimization of merge order.
@@ -2380,7 +2380,7 @@ class depgraph(object):
                                priority=mypriority, root=dep_root)
 
                        # In some cases, dep_check will return deps that shouldn't
-                       # be proccessed any further, so they are identified and
+                       # be processed any further, so they are identified and
                        # discarded here. Try to discard as few as possible since
                        # discarded dependencies reduce the amount of information
                        # available for optimization of merge order.

diff --git a/pym/portage/tests/resolver/test_slot_conflict_rebuild.py b/pym/portage/tests/resolver/test_slot_conflict_rebuild.py
index e3c517d0cc5247ee99ddafe534c3a39f26ed44ee..c7c62dd917748dd6869126a3a013cb56b109b657 100644 (file)
--- a/pym/portage/tests/resolver/test_slot_conflict_rebuild.py
+++ b/pym/portage/tests/resolver/test_slot_conflict_rebuild.py
@@ -1,4 +1,4 @@
-# Copyright 2012 Gentoo Foundation
+# Copyright 2012-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from portage.tests import TestCase