me
/
guix
Archived
1
0
Fork 0
Code

import: minetest: Fix typos. 

* guix/import/minetest.scm (elaborate-contentdb-name): Fix ‘ambiguous’
and ‘thes’ typos.
* tests/minetest.scm: Likewise for all tests.
master
Tobias Geerinckx-Rice 2021-09-27 16:06:31 +02:00
parent 770ae09860
commit 2f5368d678
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
guix/import/minetest.scm
View File

@ -203,7 +203,7 @@ raise an exception."
(match correctly-named (match correctly-named
((one) (package-keys-full-name one)) ((one) (package-keys-full-name one))
((too . many) ((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) name (package-keys-full-name too)
(map package-keys-full-name many)) (map package-keys-full-name many))
(package-keys-full-name too)) (package-keys-full-name too))
@ -256,7 +256,7 @@ and possibly some other packages as well, or #f on failure."
(order "desc")) (order "desc"))
"Search ContentDB for Q (a string). Sort by SORT, in ascending order "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 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 respectively mods, games and texture packs. Limit to at most LIMIT
results. The return value is a list of <package-keys> records." results. The return value is a list of <package-keys> records."
;; XXX does Guile have something for constructing (and, when necessary, ;; XXX does Guile have something for constructing (and, when necessary,

12
tests/minetest.scm
View File

@ -249,14 +249,14 @@ during a dynamic extent where that package is available on ContentDB."
#:guix-name "minetest-foo-bar" #:guix-name "minetest-foo-bar"
#:upstream-name "Author/foo_bar") #:upstream-name "Author/foo_bar")
(test-equal "elaborate names, unambigious" (test-equal "elaborate names, unambiguous"
"Jeija/mesecons" "Jeija/mesecons"
(call-with-packages (call-with-packages
(cut elaborate-contentdb-name "mesecons") (cut elaborate-contentdb-name "mesecons")
'(#:name "mesecons" #:author "Jeija") '(#:name "mesecons" #:author "Jeija")
'(#:name "something" #:author "else"))) '(#:name "something" #:author "else")))
(test-equal "elaborate name, ambigious (highest score)" (test-equal "elaborate name, ambiguous (highest score)"
"Jeija/mesecons" "Jeija/mesecons"
(call-with-packages (call-with-packages
;; #:sort "score" is the default ;; #: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))) '(#:name "mesecons" #:author "Jeija" #:score 999)))
(test-equal "elaborate name, ambigious (most downloads)" (test-equal "elaborate name, ambiguous (most downloads)"
"Jeija/mesecons" "Jeija/mesecons"
(call-with-packages (call-with-packages
(cut elaborate-contentdb-name "mesecons" #:sort "downloads") (cut elaborate-contentdb-name "mesecons" #:sort "downloads")
@ -308,7 +308,7 @@ during a dynamic extent where that package is available on ContentDB."
;; Dependencies ;; Dependencies
(test-package* "minetest->guix-package, unambigious dependency" (test-package* "minetest->guix-package, unambiguous dependency"
(list #:requirements '(("mesecons" #f (list #:requirements '(("mesecons" #f
("Jeija/mesecons" ("Jeija/mesecons"
"some-modpack/containing-mese"))) "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 "Jeija" #:name "mesecons")
(list #:author "some-modpack" #:name "containing-mese" #:type "modpack")) (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" (list #:name "frobnicate"
#:guix-name "minetest-frobnicate" #:guix-name "minetest-frobnicate"
#:upstream-name "Author/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 "foo" #:score 0)
(list #:author "Author" #:name "bar" #:score 9999)) (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" (list #:name "frobnicate"
#:guix-name "minetest-frobnicate" #:guix-name "minetest-frobnicate"
#:upstream-name "Author/frobnicate" #:upstream-name "Author/frobnicate"