diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-05-24 22:12:13 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-05-24 22:12:13 +0200 |
| commit | 36747eb0dad504686560afba51742f782f7c3646 (patch) | |
| tree | 2a35da31146f0a6693fd9cddfc0c514edefe9c99 /guix/scripts/lint.scm | |
| parent | ffaf5cbd361b6589daac1912aa5a43abea86e52b (diff) | |
| parent | 0b7b8fb0456475374de24b6302a6ce3cc5921ed0 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/scripts/lint.scm')
| -rw-r--r-- | guix/scripts/lint.scm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm index 6f30d371a2..04ab852999 100644 --- a/guix/scripts/lint.scm +++ b/guix/scripts/lint.scm @@ -668,16 +668,15 @@ descriptions maintained upstream." (define (check-source-file-name package) "Emit a warning if PACKAGE's origin has no meaningful file name." (define (origin-file-name-valid? origin) - ;; Return #t if the source file name contains only a version or is #f; + ;; Return #f if the source file name contains only a version or is #f; ;; indicates that the origin needs a 'file-name' field. (let ((file-name (origin-actual-file-name origin)) (version (package-version package))) (and file-name - (not (or (string-prefix? version file-name) - ;; Common in many projects is for the filename to start - ;; with a "v" followed by the version, - ;; e.g. "v3.2.0.tar.gz". - (string-prefix? (string-append "v" version) file-name)))))) + ;; Common in many projects is for the filename to start + ;; with a "v" followed by the version, + ;; e.g. "v3.2.0.tar.gz". + (not (string-match (string-append "^v?" version) file-name))))) (let ((origin (package-source package))) (unless (or (not origin) (origin-file-name-valid? origin)) |