| 1 |
commit: f5c71c9e7bf6d0913d2483eb3392f162bfbd3626 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Thu Jan 31 03:58:23 2013 +0000 |
| 4 |
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com> |
| 5 |
CommitDate: Thu Jan 31 03:58:23 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f5c71c9e |
| 7 |
|
| 8 |
Fix some typos. |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/SpawnProcess.py | 2 +- |
| 12 |
pym/_emerge/resolver/slot_collision.py | 2 +- |
| 13 |
pym/portage/process.py | 2 +- |
| 14 |
pym/portage/util/__init__.py | 4 ++-- |
| 15 |
4 files changed, 5 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py |
| 18 |
index ebba7d3..9155050 100644 |
| 19 |
--- a/pym/_emerge/SpawnProcess.py |
| 20 |
+++ b/pym/_emerge/SpawnProcess.py |
| 21 |
@@ -76,7 +76,7 @@ class SpawnProcess(SubProcess): |
| 22 |
|
| 23 |
else: |
| 24 |
# Create a dummy pipe that PipeLogger uses to efficiently |
| 25 |
- # monitors for process exit by listening for the EOF event. |
| 26 |
+ # monitor for process exit by listening for the EOF event. |
| 27 |
# Re-use of the allocated fd number for the key in fd_pipes |
| 28 |
# guarantees that the keys will not collide for similarly |
| 29 |
# allocated pipes which are used by callers such as |
| 30 |
|
| 31 |
diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py |
| 32 |
index f8e1e4e..a99d596 100644 |
| 33 |
--- a/pym/_emerge/resolver/slot_collision.py |
| 34 |
+++ b/pym/_emerge/resolver/slot_collision.py |
| 35 |
@@ -320,7 +320,7 @@ class slot_conflict_handler(object): |
| 36 |
if violated_atom.use is None: |
| 37 |
# Something like bug #453400 caused the |
| 38 |
# above findAtomForPackage call to |
| 39 |
- # to return None unexpectedly. |
| 40 |
+ # return None unexpectedly. |
| 41 |
msg = ("\n\n!!! BUG: Detected " |
| 42 |
"USE dep match inconsistency:\n" |
| 43 |
"\tppkg: %s\n" |
| 44 |
|
| 45 |
diff --git a/pym/portage/process.py b/pym/portage/process.py |
| 46 |
index d677b9f..89ebd05 100644 |
| 47 |
--- a/pym/portage/process.py |
| 48 |
+++ b/pym/portage/process.py |
| 49 |
@@ -422,7 +422,7 @@ def _setup_pipes(fd_pipes, close_fds=True): |
| 50 |
Even when close_fds is False, file descriptors referenced as |
| 51 |
values in fd_pipes are automatically closed if they do not also |
| 52 |
occur as keys in fd_pipes. It is assumed that the caller will |
| 53 |
- explicitely add them to the fd_pipes keys if they are intended |
| 54 |
+ explicitly add them to the fd_pipes keys if they are intended |
| 55 |
to remain open. This allows for convenient elimination of |
| 56 |
unnecessary duplicate file descriptors. |
| 57 |
|
| 58 |
|
| 59 |
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py |
| 60 |
index c148a73..da5277b 100644 |
| 61 |
--- a/pym/portage/util/__init__.py |
| 62 |
+++ b/pym/portage/util/__init__.py |
| 63 |
@@ -1,4 +1,4 @@ |
| 64 |
-# Copyright 2004-2012 Gentoo Foundation |
| 65 |
+# Copyright 2004-2013 Gentoo Foundation |
| 66 |
# Distributed under the terms of the GNU General Public License v2 |
| 67 |
|
| 68 |
__all__ = ['apply_permissions', 'apply_recursive_permissions', |
| 69 |
@@ -1236,7 +1236,7 @@ class atomic_ofstream(ObjectProxy): |
| 70 |
self.close() |
| 71 |
|
| 72 |
def __del__(self): |
| 73 |
- """If the user does not explicitely call close(), it is |
| 74 |
+ """If the user does not explicitly call close(), it is |
| 75 |
assumed that an error has occurred, so we abort().""" |
| 76 |
try: |
| 77 |
f = object.__getattribute__(self, '_file') |
Archives