From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Sun, 1 Dec 2013 22:27:15 +0000 (+0100)
Subject: Fix some typos.
X-Git-Tag: v2.2.8~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d35b7ac1eae27825473b8b754508fe4dabfdc731;p=portage.git

Fix some typos.
---

diff --git a/bin/egencache b/bin/egencache
index 408aec88a..9b22363f0 100755
--- 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 91955249b..53342d6d6 100644
--- 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 343cc032a..65b87d6c2 100644
--- 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 e3c517d0c..c7c62dd91 100644
--- 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