unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Arun Isaac <arunisaac@systemreboot.net>
To: 26802@debbugs.gnu.org
Subject: bug#26802: [PATCH 3/4] guix: lint: Check for version in source file name.
Date: Wed, 17 May 2017 22:22:45 +0530	[thread overview]
Message-ID: <25c18e57.AEQAKeUK09kAAAAAAAAAAAO9aM4AAAACwQwAAAAAAAW9WABZHIAR@mailjet.com> (raw)
In-Reply-To: <20170517165246.14042-1-arunisaac@systemreboot.net>

* guix/scripts/lint.scm (check-source-file-name): Check for version in source
  file name.
---
 guix/scripts/lint.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm
index 1d930d8c0..b6f73d0e6 100644
--- a/guix/scripts/lint.scm
+++ b/guix/scripts/lint.scm
@@ -667,20 +667,22 @@ 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 #f if the source file name contains only a version or is #f;
-    ;; indicates that the origin needs a 'file-name' field.
+    ;; Return #f if the source file name is #f, contains only a version, or
+    ;; does not contain a version; indicates that the origin needs a
+    ;; 'file-name' field.
     (let ((file-name (origin-actual-file-name origin))
           (version (package-version package)))
       (and 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)))))
+           (not (string-match (string-append "^v?" version) file-name))
+           (string-match version file-name))))
 
   (let ((origin (package-source package)))
     (unless (or (not origin) (origin-file-name-valid? origin))
       (emit-warning package
-                    (G_ "the source file name should contain the package name")
+                    (G_ "the source file name should contain the package name and version")
                     'source))))
 
 (define (check-mirror-url package)
-- 
2.12.2


  parent reply	other threads:[~2017-05-17 16:54 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20170517165246.14042-1-arunisaac@systemreboot.net>
2017-05-17 16:52 ` bug#26802: [PATCH 2/4] guix: lint: Slightly simplify `check-source-file-name' Arun Isaac
2017-05-18 11:30   ` Ludovic Courtès
2017-05-18 18:00     ` Arun Isaac
2017-05-17 16:52 ` Arun Isaac [this message]
2017-05-18 11:32   ` bug#26802: [PATCH 3/4] guix: lint: Check for version in source file name Ludovic Courtès
2017-05-18 17:59     ` Arun Isaac
2017-05-21  9:00       ` Alex Kost
     [not found]     ` <f8951611.AEMAKbu9720AAAAAAAAAAAOzWv8AAAACwQwAAAAAAAW9WABZHeEw@mailjet.com>
2017-05-18 21:01       ` Ludovic Courtès
2017-05-21  8:44         ` Alex Kost
2017-05-17 16:52 ` bug#26802: [PATCH 4/4] build: emacs: Fix `store-file->elisp-source-file' Arun Isaac
2017-05-21  8:33   ` Alex Kost
2017-05-21 22:24     ` Ludovic Courtès
2017-05-22 23:10       ` Arun Isaac
     [not found]       ` <cu7shjwebd7.fsf@systemreboot.net>
2017-05-23  0:52         ` Arun Isaac
     [not found]         ` <95c4b155.AEQAKqmySzQAAAAAAAAAAAOzWv8AAAACwQwAAAAAAAW9WABZI4fH@mailjet.com>
2017-05-23  8:15           ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=25c18e57.AEQAKeUK09kAAAAAAAAAAAO9aM4AAAACwQwAAAAAAAW9WABZHIAR@mailjet.com \
    --to=arunisaac@systemreboot.net \
    --cc=26802@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).