TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lint: Do not assume that a package's source is an origin. 

* guix/lint.scm (check-source-file-name): Ensure ORIGIN is an origin.
(check-patch-file-names)[patches]: Likewise.
(check-source): Likewise.
This commit is contained in:
Ludovic Courtès 2020-07-03 21:18:07 +02:00
parent c11b95af7f
commit 37c3e0bbaf
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
guix/lint.scm
View File

@ -670,8 +670,9 @@ patch could not be found."
(%make-warning package (condition-message c)
#:field 'patch-file-names))))
(define patches
(or (and=> (package-source package) origin-patches)
'()))
(match (package-source package)
((? origin? origin) (origin-patches origin))
(_ '())))
(define (starts-with-package-name? file-name)
(and=> (string-contains file-name (package-name package))
@ -792,7 +793,7 @@ descriptions maintained upstream."
(loop rest (cons warning warnings))))))))
(let ((origin (package-source package)))
(if (and origin
(if (and (origin? origin)
(eqv? (origin-method origin) url-fetch))
(let* ((uris (append-map (cut maybe-expand-mirrors <> %mirrors)
(map string->uri (origin-uris origin))))
@ -828,7 +829,7 @@ descriptions maintained upstream."
(not (string-match (string-append "^v?" version) file-name)))))
(let ((origin (package-source package)))
(if (or (not origin) (origin-file-name-valid? origin))
(if (or (not (origin? origin)) (origin-file-name-valid? origin))
'()
(list
(make-warning package