From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 22 May 2011 09:03:04 +0000 (-0700)
Subject: Fix spelling of "ambiguous".
X-Git-Tag: v2.2.0_alpha35~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=060575bae5a14f719cf839b23b6f2f59a42107b5;p=portage.git

Fix spelling of "ambiguous".
---

diff --git a/bin/regenworld b/bin/regenworld
index a314a98e8..6b5af4ca5 100755
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from __future__ import print_function
@@ -93,10 +93,10 @@ for mykey in biglist:
 			print("* ignoring broken log entry for %s (likely injected)" % mykey)
 	except ValueError as e:
 		try:
-			print("* %s is an ambigous package name, candidates are:\n%s" % (mykey, e))
+			print("* %s is an ambiguous package name, candidates are:\n%s" % (mykey, e))
 		except AttributeError:
 			# FIXME: Find out what causes this (bug #344845).
-			print("* %s is an ambigous package name" % (mykey,))
+			print("* %s is an ambiguous package name" % (mykey,))
 		continue
 	if mylist:
 		#print "mylist:",mylist
diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py
index 8e7f600b1..48ce6e74a 100644
--- a/pym/portage/tests/resolver/ResolverPlayground.py
+++ b/pym/portage/tests/resolver/ResolverPlayground.py
@@ -474,7 +474,7 @@ class ResolverPlaygroundTestCase(object):
 	def __init__(self, request, **kwargs):
 		self.all_permutations = kwargs.pop("all_permutations", False)
 		self.ignore_mergelist_order = kwargs.pop("ignore_mergelist_order", False)
-		self.ambigous_merge_order = kwargs.pop("ambigous_merge_order", False)
+		self.ambiguous_merge_order = kwargs.pop("ambiguous_merge_order", False)
 		self.check_repo_names = kwargs.pop("check_repo_names", False)
 		self.merge_order_assertions = kwargs.pop("merge_order_assertions", False)
 
@@ -535,7 +535,7 @@ class ResolverPlaygroundTestCase(object):
 					got = set(got)
 					expected = set(expected)
 
-				if self.ambigous_merge_order and got:
+				if self.ambiguous_merge_order and got:
 					expected_stack = list(reversed(expected))
 					got_stack = list(reversed(got))
 					new_expected = []
diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage/tests/resolver/test_merge_order.py
index 548f203fe..fdbfcb54d 100644
--- a/pym/portage/tests/resolver/test_merge_order.py
+++ b/pym/portage/tests/resolver/test_merge_order.py
@@ -123,12 +123,12 @@ class MergeOrderTestCase(TestCase):
 			ResolverPlaygroundTestCase(
 				["app-misc/some-app-a"],
 				success = True,
-				ambigous_merge_order = True,
+				ambiguous_merge_order = True,
 				mergelist = [("app-misc/circ-runtime-a-1", "app-misc/circ-runtime-b-1", "app-misc/circ-runtime-c-1"), "app-misc/some-app-a-1"]),
 			ResolverPlaygroundTestCase(
 				["app-misc/some-app-a"],
 				success = True,
-				ambigous_merge_order = True,
+				ambiguous_merge_order = True,
 				mergelist = [("app-misc/circ-runtime-c-1", "app-misc/circ-runtime-b-1", "app-misc/circ-runtime-a-1"), "app-misc/some-app-a-1"]),
 			# Test unsolvable circular dep that is RDEPEND in one
 			# direction and DEPEND in the other.
@@ -143,14 +143,14 @@ class MergeOrderTestCase(TestCase):
 			ResolverPlaygroundTestCase(
 				["app-misc/some-app-c", "app-misc/circ-buildtime-a"],
 				success = True,
-				ambigous_merge_order = True,
+				ambiguous_merge_order = True,
 				mergelist = [("app-misc/circ-buildtime-b-1", "app-misc/circ-buildtime-c-1"), "app-misc/circ-buildtime-a-1", "app-misc/some-app-c-1"]),
 			# Test optimal merge order for a circular dep that is
 			# RDEPEND in one direction and PDEPEND in the other.
 			ResolverPlaygroundTestCase(
 				["app-misc/some-app-b"],
 				success = True,
-				ambigous_merge_order = True,
+				ambiguous_merge_order = True,
 				mergelist = ["app-misc/circ-post-runtime-a-1", ("app-misc/circ-post-runtime-b-1", "app-misc/circ-post-runtime-c-1"), "app-misc/some-app-b-1"]),
 			# Test optimal merge order for a circular dep that is
 			# RDEPEND in one direction and DEPEND in the other,
@@ -162,7 +162,7 @@ class MergeOrderTestCase(TestCase):
 				["app-misc/circ-satisfied-a", "app-misc/circ-satisfied-b", "app-misc/circ-satisfied-c"],
 				success = True,
 				all_permutations = True,
-				ambigous_merge_order = True,
+				ambiguous_merge_order = True,
 				merge_order_assertions = (("app-misc/circ-satisfied-a-1", "app-misc/circ-satisfied-c-1"),),
 				mergelist = [("app-misc/circ-satisfied-a-1", "app-misc/circ-satisfied-b-1", "app-misc/circ-satisfied-c-1")]),
 			# installed package has buildtime-only blocker