summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org>2010-09-27 15:32:08 +0200
committerArfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org>2010-09-27 15:32:08 +0200
commit513e08a8ad3341f6bff1b769b1d6de62fdd39e4a (patch)
treee46c7c19c4e4afe809df53eae9697846132e2d3f
parentb436838302b05814a757680beb2532d5220bae83 (diff)
downloadportage-513e08a8ad3341f6bff1b769b1d6de62fdd39e4a.tar.gz
portage-513e08a8ad3341f6bff1b769b1d6de62fdd39e4a.tar.bz2
portage-513e08a8ad3341f6bff1b769b1d6de62fdd39e4a.zip
Fix some typos.
-rw-r--r--pym/_emerge/resolver/backtracking.py8
-rw-r--r--pym/portage/tests/resolver/test_multirepo.py4
2 files changed, 6 insertions, 6 deletions
diff --git a/pym/_emerge/resolver/backtracking.py b/pym/_emerge/resolver/backtracking.py
index ded97e19d..9a018cc71 100644
--- a/pym/_emerge/resolver/backtracking.py
+++ b/pym/_emerge/resolver/backtracking.py
@@ -82,7 +82,7 @@ class Backtracker(object):
def get(self):
"""
- Returns a backtrack paramater. The backtrack graph is explored with depth first.
+ Returns a backtrack parameter. The backtrack graph is explored with depth first.
"""
if self._unexplored_nodes:
node = self._unexplored_nodes.pop()
@@ -147,7 +147,7 @@ class Backtracker(object):
def feedback(self, infos):
"""
- Takes infomration from the depgraph and computes new backtrack parameters to try.
+ Takes information from the depgraph and computes new backtrack parameters to try.
"""
assert self._current_node is not None, "call feedback() only after get() was called"
@@ -165,7 +165,7 @@ class Backtracker(object):
def backtracked(self):
"""
- If we dind't backtrack, there is only the root.
+ If we didn't backtrack, there is only the root.
"""
return len(self._nodes) > 1
@@ -173,7 +173,7 @@ class Backtracker(object):
def get_best_run(self):
"""
Like, get() but returns the backtrack parameter that has as many config changes as possible,
- but has no masks. This maskes --autounmask effective, but prevents confusing error messages
+ but has no masks. This makes --autounmask effective, but prevents confusing error messages
with "masked by backtracking".
"""
best_node = self._root
diff --git a/pym/portage/tests/resolver/test_multirepo.py b/pym/portage/tests/resolver/test_multirepo.py
index 14f415c99..d44b0424c 100644
--- a/pym/portage/tests/resolver/test_multirepo.py
+++ b/pym/portage/tests/resolver/test_multirepo.py
@@ -14,7 +14,7 @@ class MultirepoTestCase(TestCase):
"dev-libs/A-2::repo1": { },
"dev-libs/A-1::repo2": { },
- #Packges in exactly one repo
+ #Packages in exactly one repo
"dev-libs/B-1": { },
"dev-libs/C-1::repo1": { },
@@ -63,7 +63,7 @@ class MultirepoTestCase(TestCase):
check_repo_names = True,
mergelist = ["dev-libs/A-1"]),
- #Packges in exactly one repo
+ #Packages in exactly one repo
ResolverPlaygroundTestCase(
["dev-libs/B"],
success = True,