diff options
| -rw-r--r-- | guix/import/minetest.scm | 4 | ||||
| -rw-r--r-- | tests/minetest.scm | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/guix/import/minetest.scm b/guix/import/minetest.scm index 29bf12d123..ba86c60bfd 100644 --- a/guix/import/minetest.scm +++ b/guix/import/minetest.scm @@ -203,7 +203,7 @@ raise an exception." (match correctly-named ((one) (package-keys-full-name one)) ((too . many) - (warning (G_ "~a is ambigious, presuming ~a (other options include: ~a)~%") + (warning (G_ "~a is ambiguous, presuming ~a (other options include: ~a)~%") name (package-keys-full-name too) (map package-keys-full-name many)) (package-keys-full-name too)) @@ -256,7 +256,7 @@ and possibly some other packages as well, or #f on failure." (order "desc")) "Search ContentDB for Q (a string). Sort by SORT, in ascending order if ORDER is \"asc\" or descending order if ORDER is \"desc\". TYPE must -be \"mod\", \"game\" or \"txp\", restricting thes search results to +be \"mod\", \"game\" or \"txp\", restricting the search results to respectively mods, games and texture packs. Limit to at most LIMIT results. The return value is a list of <package-keys> records." ;; XXX does Guile have something for constructing (and, when necessary, diff --git a/tests/minetest.scm b/tests/minetest.scm index 6998c9a70b..abb26d0a03 100644 --- a/tests/minetest.scm +++ b/tests/minetest.scm @@ -249,14 +249,14 @@ during a dynamic extent where that package is available on ContentDB." #:guix-name "minetest-foo-bar" #:upstream-name "Author/foo_bar") -(test-equal "elaborate names, unambigious" +(test-equal "elaborate names, unambiguous" "Jeija/mesecons" (call-with-packages (cut elaborate-contentdb-name "mesecons") '(#:name "mesecons" #:author "Jeija") '(#:name "something" #:author "else"))) -(test-equal "elaborate name, ambigious (highest score)" +(test-equal "elaborate name, ambiguous (highest score)" "Jeija/mesecons" (call-with-packages ;; #:sort "score" is the default @@ -266,7 +266,7 @@ during a dynamic extent where that package is available on ContentDB." '(#:name "mesecons" #:author "Jeija" #:score 999))) -(test-equal "elaborate name, ambigious (most downloads)" +(test-equal "elaborate name, ambiguous (most downloads)" "Jeija/mesecons" (call-with-packages (cut elaborate-contentdb-name "mesecons" #:sort "downloads") @@ -308,7 +308,7 @@ during a dynamic extent where that package is available on ContentDB." ;; Dependencies -(test-package* "minetest->guix-package, unambigious dependency" +(test-package* "minetest->guix-package, unambiguous dependency" (list #:requirements '(("mesecons" #f ("Jeija/mesecons" "some-modpack/containing-mese"))) @@ -316,7 +316,7 @@ during a dynamic extent where that package is available on ContentDB." (list #:author "Jeija" #:name "mesecons") (list #:author "some-modpack" #:name "containing-mese" #:type "modpack")) -(test-package* "minetest->guix-package, ambigious dependency (highest score)" +(test-package* "minetest->guix-package, ambiguous dependency (highest score)" (list #:name "frobnicate" #:guix-name "minetest-frobnicate" #:upstream-name "Author/frobnicate" @@ -327,7 +327,7 @@ during a dynamic extent where that package is available on ContentDB." (list #:author "Author" #:name "foo" #:score 0) (list #:author "Author" #:name "bar" #:score 9999)) -(test-package* "minetest->guix-package, ambigious dependency (most downloads)" +(test-package* "minetest->guix-package, ambiguous dependency (most downloads)" (list #:name "frobnicate" #:guix-name "minetest-frobnicate" #:upstream-name "Author/frobnicate" |