From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathieu Lirzin Subject: [PATCH 02/13] lint: Remove an unneeded clause in 'check-patch-file-names'. Date: Sun, 24 Jan 2016 21:19:20 +0100 Message-ID: <1453666771-16869-3-git-send-email-mthl@gnu.org> References: <1453666771-16869-1-git-send-email-mthl@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.7.0.rc3" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46215) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNR96-0003a5-Un for guix-devel@gnu.org; Sun, 24 Jan 2016 15:20:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aNR93-0005bv-TJ for guix-devel@gnu.org; Sun, 24 Jan 2016 15:20:24 -0500 In-Reply-To: <1453666771-16869-1-git-send-email-mthl@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org This is a multi-part message in MIME format. --------------2.7.0.rc3 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: quoted-printable * guix/scripts/lint.scm (check-patch-file-names): Don't check if patches start with the package full name since matching the package name (which is a prefix of the full name) is sufficient. --- guix/scripts/lint.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) --------------2.7.0.rc3 Content-Type: text/x-patch; name="0002-lint-Remove-an-unneeded-clause-in-check-patch-file-n.patch" Content-Disposition: inline; filename="0002-lint-Remove-an-unneeded-clause-in-check-patch-file-n.patch" Content-Transfer-Encoding: quoted-printable diff --git a/guix/scripts/lint.scm b/guix/scripts/lint.scm index e2cc965..25f49a7 100644 --- a/guix/scripts/lint.scm +++ b/guix/scripts/lint.scm @@ -2,7 +2,7 @@ ;;; Copyright =C2=A9 2014 Cyril Roelandt ;;; Copyright =C2=A9 2014, 2015 Eric Bavier ;;; Copyright =C2=A9 2013, 2014, 2015, 2016 Ludovic Court=C3=A8s -;;; Copyright =C2=A9 2015 Mathieu Lirzin +;;; Copyright =C2=A9 2015, 2016 Mathieu Lirzin ;;; ;;; This file is part of GNU Guix. ;;; @@ -417,15 +417,12 @@ patch could not be found." (emit-warning package (condition-message c) 'patch-file-names))) (let ((patches (and=3D> (package-source package) origin-patches)) - (name (package-name package)) - (full-name (package-full-name package))) + (name (package-name package))) (when (and patches (any (match-lambda ((? string? patch) (let ((file (basename patch))) - (not (or (eq? (string-contains file name) 0) - (eq? (string-contains file full-name= ) - 0))))) + (not (eq? (string-contains file name) 0)))) (_ ;; This must be an or something like t= hat. #f)) --------------2.7.0.rc3--