From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Thomas Fitzsimmons Newsgroups: gmane.emacs.bugs Subject: bug#36301: Package-Requires should support multiple lines Date: Fri, 16 Aug 2019 17:42:14 -0400 Message-ID: References: <87d0j8wkt1.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="61414"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 36301@debbugs.gnu.org To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Aug 16 23:43:11 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hyk07-000Fse-Bk for geb-bug-gnu-emacs@m.gmane.org; Fri, 16 Aug 2019 23:43:11 +0200 Original-Received: from localhost ([::1]:60140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyk06-0007Bk-BG for geb-bug-gnu-emacs@m.gmane.org; Fri, 16 Aug 2019 17:43:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:35289) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyjzz-0007BQ-49 for bug-gnu-emacs@gnu.org; Fri, 16 Aug 2019 17:43:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyjzx-0003Pr-WE for bug-gnu-emacs@gnu.org; Fri, 16 Aug 2019 17:43:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:46286) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hyjzx-0003Pm-SR for bug-gnu-emacs@gnu.org; Fri, 16 Aug 2019 17:43:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hyjzx-00084W-PU for bug-gnu-emacs@gnu.org; Fri, 16 Aug 2019 17:43:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Thomas Fitzsimmons Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 16 Aug 2019 21:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36301 X-GNU-PR-Package: emacs Original-Received: via spool by 36301-submit@debbugs.gnu.org id=B36301.156599174530973 (code B ref 36301); Fri, 16 Aug 2019 21:43:01 +0000 Original-Received: (at 36301) by debbugs.gnu.org; 16 Aug 2019 21:42:25 +0000 Original-Received: from localhost ([127.0.0.1]:55107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hyjzN-00083U-60 for submit@debbugs.gnu.org; Fri, 16 Aug 2019 17:42:25 -0400 Original-Received: from mail-io1-f50.google.com ([209.85.166.50]:42426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hyjzK-00083G-CL for 36301@debbugs.gnu.org; Fri, 16 Aug 2019 17:42:23 -0400 Original-Received: by mail-io1-f50.google.com with SMTP id e20so9087356iob.9 for <36301@debbugs.gnu.org>; Fri, 16 Aug 2019 14:42:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fitzsim-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=3BnLqvspQb+xqcIYkBebQLjri4iZVaDVA2x8ybaqVYM=; b=hLOHNmpZf+/Gakn/2NtrCDJbTjpGSa4v0wX5pUgmzCESLNHc8oZkzbQCm0SZrM/DeB 9zlWs4NaY7nwf6MCb0TYJ3/oHE5IwyGItafzshFfX/jyMC5DeuGNU2K/9oOSAnz3UqWj 6Zwc2G3aEAJ8l0ucex28IFEJT8Zt/ZCMvPRW6cxy9CGEXfBURpEf2enFZl0JiR9xkyUU TVVOTE9EsjN3iK4xovIaZRm+vLjF8l9XjaoN+FI6WNk5HY4szpTBPwNpaSC82t82EzH5 DX/xWsQZBKaMFs/E4e9oOmw3lnCIeNgMS7paQA+NVSAl7ImcDEHkgOXBtIJbLsgiV+2R xkYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=3BnLqvspQb+xqcIYkBebQLjri4iZVaDVA2x8ybaqVYM=; b=bRjyZ/7irIz7JZKmEKR9A6y1YcJzWBAOW6BmMd89n/XkOo5Dx/n/fYFt4PEWbv7h2l WKMtGJh7UpZYx6Jum/ms2Yq/eGIXsGTYw79DcNAs5bef4DhqrMoOsoqafwm9a7lOyIgV rvm99JfbOTN9iSmmmpRQ2GM9kxeyvPz8DXQf7kN/fJz0B7rcyFmBElop6/ter2qPjped nv7ED14PIrvEQE+71qW3F4NlJxqXQ8JbV2ghOVyz1VF8QeuY0Az/wxAj2OHqKp1/tHL1 GA944luY6BIXGaLmOcWaiySRSWNXeRjYWGhYwxmCI/OA86UJ2pTvjG+uvkqDMwrR0+Ff ZskQ== X-Gm-Message-State: APjAAAWhiI7GM4NXvR1Z9iOeJuYp6PWhokQfjAwbSIECnb/+KE4A7ll9 NVxB3WGa+Cemv8lnbZ9FZ26as21KZkyvlQ== X-Google-Smtp-Source: APXvYqxKSr3eTWal4PAuYO/f0JLCMeZSKYIlInZkp+KDyfrdzxvJo6Ts7epQZlxIiIWbZvQWHB4YaQ== X-Received: by 2002:a02:a703:: with SMTP id k3mr12912707jam.12.1565991736388; Fri, 16 Aug 2019 14:42:16 -0700 (PDT) Original-Received: from localhost.localdomain (69-165-165-189.dsl.teksavvy.com. [69.165.165.189]) by smtp.gmail.com with ESMTPSA id o127sm10327869iof.45.2019.08.16.14.42.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 16 Aug 2019 14:42:15 -0700 (PDT) In-Reply-To: (Thomas Fitzsimmons's message of "Fri, 16 Aug 2019 12:22:33 -0400") 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: 209.51.188.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:165235 Archived-At: Hi, Thomas Fitzsimmons writes: > Glenn Morris writes: > >> This causes test failures; ref >> https://hydra.nixos.org/build/98765298 > > OK, thanks for reporting. I reverted the patch for now. Here is the updated patch that fixes the test failures the prior one introduced. "make check" still fails with and without the patch, but only on some unrelated Tramp and D-Bus tests. If this looks OK, I'll push it to master; in particular I wonder if there's a better way to do the equivalent of mapconcat but produce nil on a nil input sequence. Thanks, Thomas diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index a72522ad8f..b0416cb002 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1028,6 +1028,7 @@ package--prepare-dependencies deps)))) (declare-function lm-header "lisp-mnt" (header)) +(declare-function lm-header-multiline "lisp-mnt" (header)) (declare-function lm-homepage "lisp-mnt" (&optional file)) (declare-function lm-keywords-list "lisp-mnt" (&optional file)) (declare-function lm-maintainer "lisp-mnt" (&optional file)) @@ -1054,7 +1055,9 @@ package-buffer-info (narrow-to-region start (point)) (require 'lisp-mnt) ;; Use some headers we've invented to drive the process. - (let* ((requires-str (lm-header "package-requires")) + (let* ((requires-str (lm-header-multiline "package-requires")) + (requires-str (when requires-str + (mapconcat 'identity requires-str " "))) ;; Prefer Package-Version; if defined, the package author ;; probably wants us to use it. Otherwise try Version. (pkg-version