| 1 |
commit: d35b7ac1eae27825473b8b754508fe4dabfdc731 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Sun Dec 1 22:27:15 2013 +0000 |
| 4 |
Commit: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 5 |
CommitDate: Sun Dec 1 22:27:15 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d35b7ac1 |
| 7 |
|
| 8 |
Fix some typos. |
| 9 |
|
| 10 |
--- |
| 11 |
bin/egencache | 2 +- |
| 12 |
pym/_emerge/BlockerCache.py | 6 +++--- |
| 13 |
pym/_emerge/depgraph.py | 4 ++-- |
| 14 |
pym/portage/tests/resolver/test_slot_conflict_rebuild.py | 2 +- |
| 15 |
4 files changed, 7 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/bin/egencache b/bin/egencache |
| 18 |
index 408aec8..9b22363 100755 |
| 19 |
--- a/bin/egencache |
| 20 |
+++ b/bin/egencache |
| 21 |
@@ -137,7 +137,7 @@ def parse_args(args): |
| 22 |
help="do not use the EGENCACHE_DEFAULT_OPTS environment variable") |
| 23 |
common.add_argument("--write-timestamp", |
| 24 |
action="store_true", |
| 25 |
- help="write metdata/timestamp.chk as required for rsync repositories") |
| 26 |
+ help="write metadata/timestamp.chk as required for rsync repositories") |
| 27 |
|
| 28 |
update = parser.add_argument_group('--update options') |
| 29 |
update.add_argument("--cache-dir", |
| 30 |
|
| 31 |
diff --git a/pym/_emerge/BlockerCache.py b/pym/_emerge/BlockerCache.py |
| 32 |
index 9195524..53342d6 100644 |
| 33 |
--- a/pym/_emerge/BlockerCache.py |
| 34 |
+++ b/pym/_emerge/BlockerCache.py |
| 35 |
@@ -1,4 +1,4 @@ |
| 36 |
-# Copyright 1999-2012 Gentoo Foundation |
| 37 |
+# Copyright 1999-2013 Gentoo Foundation |
| 38 |
# Distributed under the terms of the GNU General Public License v2 |
| 39 |
|
| 40 |
import errno |
| 41 |
@@ -128,9 +128,9 @@ class BlockerCache(portage.cache.mappings.MutableMapping): |
| 42 |
self._modified.clear() |
| 43 |
|
| 44 |
def flush(self): |
| 45 |
- """If the current user has permission and the internal blocker cache |
| 46 |
+ """If the current user has permission and the internal blocker cache has |
| 47 |
been updated, save it to disk and mark it unmodified. This is called |
| 48 |
- by emerge after it has proccessed blockers for all installed packages. |
| 49 |
+ by emerge after it has processed blockers for all installed packages. |
| 50 |
Currently, the cache is only written if the user has superuser |
| 51 |
privileges (since that's required to obtain a lock), but all users |
| 52 |
have read access and benefit from faster blocker lookups (as long as |
| 53 |
|
| 54 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 55 |
index 343cc03..65b87d6 100644 |
| 56 |
--- a/pym/_emerge/depgraph.py |
| 57 |
+++ b/pym/_emerge/depgraph.py |
| 58 |
@@ -2269,7 +2269,7 @@ class depgraph(object): |
| 59 |
def _ignore_dependency(self, atom, pkg, child, dep, mypriority, recurse_satisfied): |
| 60 |
""" |
| 61 |
In some cases, dep_check will return deps that shouldn't |
| 62 |
- be proccessed any further, so they are identified and |
| 63 |
+ be processed any further, so they are identified and |
| 64 |
discarded here. Try to discard as few as possible since |
| 65 |
discarded dependencies reduce the amount of information |
| 66 |
available for optimization of merge order. |
| 67 |
@@ -2380,7 +2380,7 @@ class depgraph(object): |
| 68 |
priority=mypriority, root=dep_root) |
| 69 |
|
| 70 |
# In some cases, dep_check will return deps that shouldn't |
| 71 |
- # be proccessed any further, so they are identified and |
| 72 |
+ # be processed any further, so they are identified and |
| 73 |
# discarded here. Try to discard as few as possible since |
| 74 |
# discarded dependencies reduce the amount of information |
| 75 |
# available for optimization of merge order. |
| 76 |
|
| 77 |
diff --git a/pym/portage/tests/resolver/test_slot_conflict_rebuild.py b/pym/portage/tests/resolver/test_slot_conflict_rebuild.py |
| 78 |
index e3c517d..c7c62dd 100644 |
| 79 |
--- a/pym/portage/tests/resolver/test_slot_conflict_rebuild.py |
| 80 |
+++ b/pym/portage/tests/resolver/test_slot_conflict_rebuild.py |
| 81 |
@@ -1,4 +1,4 @@ |
| 82 |
-# Copyright 2012 Gentoo Foundation |
| 83 |
+# Copyright 2012-2013 Gentoo Foundation |
| 84 |
# Distributed under the terms of the GNU General Public License v2 |
| 85 |
|
| 86 |
from portage.tests import TestCase |
Archives