[gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/, pym/portage/, pym/portage/util/, pym/_emerge/

[gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/, pym/portage/, pym/portage/util/, pym/_emerge/

[Arfrever Frehtes Taifersar Arahesis]

commit:     f5c71c9e7bf6d0913d2483eb3392f162bfbd3626
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jan 31 03:58:23 2013 +0000
Commit:     Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
CommitDate: Thu Jan 31 03:58:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f5c71c9e

Fix some typos.

---
 pym/_emerge/SpawnProcess.py            |    2 +-
 pym/_emerge/resolver/slot_collision.py |    2 +-
 pym/portage/process.py                 |    2 +-
 pym/portage/util/__init__.py           |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py
index ebba7d3..9155050 100644
--- a/pym/_emerge/SpawnProcess.py
+++ b/pym/_emerge/SpawnProcess.py
@@ -76,7 +76,7 @@ class SpawnProcess(SubProcess):
 
 		else:
 			# Create a dummy pipe that PipeLogger uses to efficiently
-			# monitors for process exit by listening for the EOF event.
+			# monitor for process exit by listening for the EOF event.
 			# Re-use of the allocated fd number for the key in fd_pipes
 			# guarantees that the keys will not collide for similarly
 			# allocated pipes which are used by callers such as

diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py
index f8e1e4e..a99d596 100644
--- a/pym/_emerge/resolver/slot_collision.py
+++ b/pym/_emerge/resolver/slot_collision.py
@@ -320,7 +320,7 @@ class slot_conflict_handler(object):
 									if violated_atom.use is None:
 										# Something like bug #453400 caused the
 										# above findAtomForPackage call to
-										# to return None unexpectedly.
+										# return None unexpectedly.
 										msg = ("\n\n!!! BUG: Detected "
 											"USE dep match inconsistency:\n"
 											"\tppkg: %s\n"

diff --git a/pym/portage/process.py b/pym/portage/process.py
index d677b9f..89ebd05 100644
--- a/pym/portage/process.py
+++ b/pym/portage/process.py
@@ -422,7 +422,7 @@ def _setup_pipes(fd_pipes, close_fds=True):
 	Even when close_fds is False, file descriptors referenced as
 	values in fd_pipes are automatically closed if they do not also
 	occur as keys in fd_pipes. It is assumed that the caller will
-	explicitely add them to the fd_pipes keys if they are intended
+	explicitly add them to the fd_pipes keys if they are intended
 	to remain open. This allows for convenient elimination of
 	unnecessary duplicate file descriptors.
 

diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index c148a73..da5277b 100644
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2004-2012 Gentoo Foundation
+# Copyright 2004-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 __all__ = ['apply_permissions', 'apply_recursive_permissions',
@@ -1236,7 +1236,7 @@ class atomic_ofstream(ObjectProxy):
 			self.close()
 
 	def __del__(self):
-		"""If the user does not explicitely call close(), it is
+		"""If the user does not explicitly call close(), it is
 		assumed that an error has occurred, so we abort()."""
 		try:
 			f = object.__getattribute__(self, '_file')