From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7165C138786 for ; Thu, 31 Jan 2013 03:58:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B532421C014; Thu, 31 Jan 2013 03:58:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 385AB21C014 for ; Thu, 31 Jan 2013 03:58:41 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C6A8C33DBE6 for ; Thu, 31 Jan 2013 03:58:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3E46EE4073 for ; Thu, 31 Jan 2013 03:58:37 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: <1359604703.f5c71c9e7bf6d0913d2483eb3392f162bfbd3626.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/, pym/portage/, pym/portage/util/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/SpawnProcess.py pym/_emerge/resolver/slot_collision.py pym/portage/process.py pym/portage/util/__init__.py X-VCS-Directories: pym/_emerge/resolver/ pym/portage/ pym/portage/util/ pym/_emerge/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: f5c71c9e7bf6d0913d2483eb3392f162bfbd3626 X-VCS-Branch: master Date: Thu, 31 Jan 2013 03:58:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9fcaf9c9-7c7b-42f7-a875-f70e1af7ff6e X-Archives-Hash: e5b940a85fbf963bcbb13a7623d8693d commit: f5c71c9e7bf6d0913d2483eb3392f162bfbd3626 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Thu Jan 31 03:58:23 2013 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gmail 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')