From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: npostavs@users.sourceforge.net Newsgroups: gmane.emacs.bugs Subject: bug#27963: [PATCH] Remove custom version parsing in epg-config.el Date: Fri, 04 Aug 2017 22:45:07 -0400 Message-ID: <87mv7e68cs.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1501901062 13728 195.159.176.226 (5 Aug 2017 02:44:22 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 5 Aug 2017 02:44:22 +0000 (UTC) Cc: Daiki Ueno To: 27963@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Aug 05 04:44:16 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddp4Z-0002rM-9d for geb-bug-gnu-emacs@m.gmane.org; Sat, 05 Aug 2017 04:44:15 +0200 Original-Received: from localhost ([::1]:55143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddp4a-0000ro-26 for geb-bug-gnu-emacs@m.gmane.org; Fri, 04 Aug 2017 22:44:16 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddp4S-0000rT-GU for bug-gnu-emacs@gnu.org; Fri, 04 Aug 2017 22:44:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddp4R-0005eN-Q1 for bug-gnu-emacs@gnu.org; Fri, 04 Aug 2017 22:44:08 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:39638) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ddp4M-0005bB-Qo; Fri, 04 Aug 2017 22:44:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ddp4M-0004Zk-K6; Fri, 04 Aug 2017 22:44:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: npostavs@users.sourceforge.net Original-Sender: "Debbugs-submit" Resent-CC: ueno@gnu.org, bug-gnu-emacs@gnu.org Resent-Date: Sat, 05 Aug 2017 02:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 27963 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org X-Debbugs-Original-Xcc: Daiki Ueno Original-Received: via spool by submit@debbugs.gnu.org id=B.150190102117550 (code B ref -1); Sat, 05 Aug 2017 02:44:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 5 Aug 2017 02:43:41 +0000 Original-Received: from localhost ([127.0.0.1]:42315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddp40-0004Z0-Ne for submit@debbugs.gnu.org; Fri, 04 Aug 2017 22:43:41 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:57997) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ddp3y-0004Ye-VG for submit@debbugs.gnu.org; Fri, 04 Aug 2017 22:43:39 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddp3s-0005Il-VA for submit@debbugs.gnu.org; Fri, 04 Aug 2017 22:43:33 -0400 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:53215) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ddp3s-0005Ia-Rw for submit@debbugs.gnu.org; Fri, 04 Aug 2017 22:43:32 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48954) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ddp3r-0000ot-PX for bug-gnu-emacs@gnu.org; Fri, 04 Aug 2017 22:43:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ddp3n-0005G3-OQ for bug-gnu-emacs@gnu.org; Fri, 04 Aug 2017 22:43:31 -0400 Original-Received: from mail-it0-x22c.google.com ([2607:f8b0:4001:c0b::22c]:36809) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ddp3n-0005En-IB for bug-gnu-emacs@gnu.org; Fri, 04 Aug 2017 22:43:27 -0400 Original-Received: by mail-it0-x22c.google.com with SMTP id 77so15325757itj.1 for ; Fri, 04 Aug 2017 19:43:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:mime-version; bh=GqiU0pghFroe50jsbBqiFwzE3hlGZPJ7jDom/IHebxU=; b=HSsQsbs640SWcPGmA72x2HwaBFqbZ67Ki7XKhHHgC8bJBhUXDO+PXLSe6SSIW7LBtw DvTgdL1jFhWT01uP0xi3fQ/wJlwr4HsoSOiMsdxKSkMwRncR8jyA2uBbfWvxWJNoHWIK HQL7ZLbVpK55PQofJ1YC2yqoiM1OWCcFf1Aovvp3rXMLrFSl2kAzYoAg5AfULOAF3t6u ytmy0RPCkO6W+vDQAALBY3v0yfjXaILxyD2ZxTDgnxeBn2F9ljA8jcTF5s7pKwN/pLLw IIRFdkudLq2fSR1TC57GFk5/BABUESi0U7TpFT01TBlxcPdqgpivo6WggDEEShwcqdCV vjyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :mime-version; bh=GqiU0pghFroe50jsbBqiFwzE3hlGZPJ7jDom/IHebxU=; b=IScxERNsj5tfNRVQFIChA34rDJUGx+uSzXMai1R0znw+zKQJkjFQvxgNP2Kn7LoFcZ LFUMfm7kUK8Y/PXe/yJZ50rtjdFSEfjrPaNUnohqjTlos7WrpIW0JgZhMXSIVKndywe+ sWWQYyPR/X9+wBBasXdSo5WGvrkbb1VOgn4EfgIZ35r9a04qOhVsW2xUIQ+EAMJj7bir Qon0wughMzXt20NbfGR5VHr+Yy3Eag0GgnXEuMHtF2NtydS9UQjrWYfw524pxBWS7uHx RG6qCLlrV6k0qY/D2sv29hf5QSsGHcvysYmi4SB2tIwVtJXh0ELSWN1gAUnxlNEJ4Fnl 7Q/g== X-Gm-Message-State: AIVw111iO5h8qnHvEFMZFN+CZyQ+d73KrCb7jmY5jHXs0WIKv3o+chbB p+BpHomUH/+oJ5hz X-Received: by 10.36.121.203 with SMTP id z194mr4533452itc.1.1501901006488; Fri, 04 Aug 2017 19:43:26 -0700 (PDT) Original-Received: from zony ([45.2.119.48]) by smtp.googlemail.com with ESMTPSA id 63sm1175925ith.4.2017.08.04.19.43.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 04 Aug 2017 19:43:25 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:135376 Archived-At: --=-=-= Content-Type: text/plain Severity: wishlist Tags: patch --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Remove-custom-version-parsing-functions-from-epg-con.patch Content-Description: patch >From 9415fb046b260cfdb1f87aa396f652d916abd71e Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sat, 22 Jul 2017 23:54:34 -0400 Subject: [PATCH] Remove custom version parsing functions from epg-config.el * lisp/epg-config.el (epg-config--compare-version) (epg-config--parse-version): Remove. (epg-check-configuration): Use `version<=' instead. --- lisp/epg-config.el | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/lisp/epg-config.el b/lisp/epg-config.el index 7b963add88..6aed354ca4 100644 --- a/lisp/epg-config.el +++ b/lisp/epg-config.el @@ -210,34 +210,16 @@ (defun epg-configuration () (declare (obsolete epg-find-configuration "25.1")) (epg-config--make-gpg-configuration epg-gpg-program)) -(defun epg-config--parse-version (string) - (let ((index 0) - version) - (while (eq index (string-match "\\([0-9]+\\)\\.?" string index)) - (setq version (cons (string-to-number (match-string 1 string)) - version) - index (match-end 0))) - (nreverse version))) - -(defun epg-config--compare-version (v1 v2) - (while (and v1 v2 (= (car v1) (car v2))) - (setq v1 (cdr v1) v2 (cdr v2))) - (- (or (car v1) 0) (or (car v2) 0))) - ;;;###autoload (defun epg-check-configuration (config &optional minimum-version) "Verify that a sufficient version of GnuPG is installed." - (let ((entry (assq 'version config)) - version) - (unless (and entry - (stringp (cdr entry))) - (error "Undetermined version: %S" entry)) - (setq version (epg-config--parse-version (cdr entry)) - minimum-version (epg-config--parse-version - (or minimum-version - epg-gpg-minimum-version))) - (unless (>= (epg-config--compare-version version minimum-version) 0) - (error "Unsupported version: %s" (cdr entry))))) + (let ((version (alist-get 'version config))) + (unless (stringp version) + (error "Undetermined version: %S" version)) + (unless (version<= (or minimum-version + epg-gpg-minimum-version) + version) + (error "Unsupported version: %s" version)))) ;;;###autoload (defun epg-expand-group (config group) -- 2.11.1 --=-=-=--