[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#26802: [PATCH 2/4] guix: lint: Slightly simplify `check-source-file-
From: |
Arun Isaac |
Subject: |
bug#26802: [PATCH 2/4] guix: lint: Slightly simplify `check-source-file-name'. |
Date: |
Wed, 17 May 2017 22:22:44 +0530 |
* 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 2b0071475..1d930d8c0 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -672,11 +672,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))
--
2.12.2
- bug#26802: [PATCH 2/4] guix: lint: Slightly simplify `check-source-file-name'.,
Arun Isaac <=