[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: guix: lint: Slightly simplify `check-source-file-name'.
From: |
Arun Isaac |
Subject: |
02/03: guix: lint: Slightly simplify `check-source-file-name'. |
Date: |
Mon, 22 May 2017 19:07:21 -0400 (EDT) |
arunisaac pushed a commit to branch master
in repository guix.
commit 5ae59eb6d99b7ac6e3334418781b0559bf604a23
Author: Arun Isaac <address@hidden>
Date: Wed May 17 21:30:12 2017 +0530
guix: lint: Slightly simplify `check-source-file-name'.
* guix/scripts/lint.scm (check-source-file-name): Implement file name
matching
with regular expression.
---
guix/scripts/lint.scm | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
index 46989e3..04ab852 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -673,11 +673,10 @@ descriptions maintained upstream."
(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))