diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2013-01-31 04:58:23 +0100 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2013-01-31 04:58:23 +0100 |
| commit | f5c71c9e7bf6d0913d2483eb3392f162bfbd3626 (patch) | |
| tree | 00f2331aa8730eb823ab820840314d873c458a4b /pym | |
| parent | ebuild.5: update example ebuild copyright date (diff) | |
| download | portage-f5c71c9e7bf6d0913d2483eb3392f162bfbd3626.tar.gz portage-f5c71c9e7bf6d0913d2483eb3392f162bfbd3626.tar.bz2 portage-f5c71c9e7bf6d0913d2483eb3392f162bfbd3626.zip | |
Fix some typos.
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/SpawnProcess.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/resolver/slot_collision.py | 2 | ||||
| -rw-r--r-- | pym/portage/process.py | 2 | ||||
| -rw-r--r-- | 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 ebba7d3d4..9155050ab 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 f8e1e4ecd..a99d59645 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 d677b9fa8..89ebd0553 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 c148a739d..da5277bff 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') |