From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#64242: [PATCH] Fix VC package build when there is no docs dir Date: Sat, 24 Jun 2023 10:24:47 +0000 Message-ID: <87o7l5ma34.fsf@posteo.net> References: <877cruvijk.fsf@dsemy.com> <83352i3ed4.fsf@gnu.org> <87fs6ilme6.fsf@dsemy.com> <83zg4q1woh.fsf@gnu.org> <87r0q2r5qt.fsf@posteo.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="18971"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 64242@debbugs.gnu.org, Daniel Semyonov To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jun 24 12:25:52 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qD0Sm-0004kB-91 for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 24 Jun 2023 12:25:52 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qD0SN-0000ZU-3u; Sat, 24 Jun 2023 06:25:27 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qD0SC-0000XE-KN for bug-gnu-emacs@gnu.org; Sat, 24 Jun 2023 06:25:19 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qD0Ry-0004RM-Nc for bug-gnu-emacs@gnu.org; Sat, 24 Jun 2023 06:25:04 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qD0Ry-0000dQ-29 for bug-gnu-emacs@gnu.org; Sat, 24 Jun 2023 06:25:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 24 Jun 2023 10:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64242 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 64242-submit@debbugs.gnu.org id=B64242.16876023012414 (code B ref 64242); Sat, 24 Jun 2023 10:25:02 +0000 Original-Received: (at 64242) by debbugs.gnu.org; 24 Jun 2023 10:25:01 +0000 Original-Received: from localhost ([127.0.0.1]:39947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qD0Rw-0000cr-Px for submit@debbugs.gnu.org; Sat, 24 Jun 2023 06:25:01 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:32901) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qD0Rr-0000cZ-3z for 64242@debbugs.gnu.org; Sat, 24 Jun 2023 06:24:58 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 945C6240105 for <64242@debbugs.gnu.org>; Sat, 24 Jun 2023 12:24:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687602289; bh=dDW4abpDHDfYHqnajYEghGBAZkReoI8e/KM9b83CFyg=; h=From:To:Cc:Subject:Autocrypt:Date:Message-ID:MIME-Version:From; b=WQDmTypSU7Szc+s8cp7dt4q5eGKxaHgiHgPk0cZO8y7vDfqaVQhzaGWVT8S/V8AYv fVafxv8hdLH4ARU6bZr/1quB5zyPincoLF8IEBAGy4mAOqEQVCZSyd+VR4UlqYPias a2noe195+EyygDyK0USfhzeld8JNey71PLDpcsL0UwSpg8SJnuZKCtcXdiQ8ph4b4Q g1tIMTpSpBNRhXI5S1yVOjljdF1EpRZ3UIIGZmrfbH+6tGsCnR90388ETMZfNmLLzd SDpHot8U9IWDvHIZrGC2tTel9BXp7lO47of0hiZxMLNERH4S4AfJpOXnsJQRc7iLGt 9DCH4/RbE8dtA== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Qp9G84TxGz6tvk; Sat, 24 Jun 2023 12:24:48 +0200 (CEST) In-Reply-To: <87r0q2r5qt.fsf@posteo.net> (Philip Kaludercic's message of "Fri, 23 Jun 2023 07:35:06 +0000") X-Hashcash: 1:20:230624:eliz@gnu.org::VtMoLBjLemDXGpK8:0lfd X-Hashcash: 1:20:230624:daniel@dsemy.com::QyysDDeELK936F0o:46Kj X-Hashcash: 1:20:230624:64242@debbugs.gnu.org::12LQYpY1pTyZjUtT:3WTm Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:263982 Archived-At: Philip Kaludercic writes: > Eli Zaretskii writes: > >>> From: Daniel Semyonov >>> Cc: 64242@debbugs.gnu.org >>> Date: Fri, 23 Jun 2023 09:32:01 +0300 >>> >>> >>>>> Eli Zaretskii writes: >>> >>> > What do you mean by "isn't a directory"? FILE is supposed to be a >>> > documentation file, not a directory, see the doc string of this >>> > function. Do you mean that FILE is a relative file name so that >>> > file-name-directory returns nil for it? If so, I think the >>> > correct fix would be to reverse the order: >>> >>> > (docs-directory (file-name-directory (expand-file-name file))) >>> >>> Yeah, you're completely right, this was a misunderstanding on my part; >>> my fix just happened to also work so I made some incorrect assumptions. >>> >>> After some further testing, this seems to happen for packages for which >>> the doc file is in the base directory of the package (which causes >>> 'file-name-directory' to return nil as the doc file name is relative to >>> the package dir). >>> >>> I attached an updated patch. >>> >>> > Can you show a recipe to reproduce this problem, preferably >>> > starting from "emacs -Q"? >>> >>> 1. $ emacs -Q >>> 2. M-x package-vc-install RET eat RET >>> 3. A few seconds later, >>> "package-vc--unpack-1: Wrong type argument: stringp, nil" >>> >>> > And finally, this issue exists on the emacs-29 release branch as >>> > well, doesn't it? >>> >>> I haven't tested it, but I don't see a reason it wont. >> >> Philip, any comments or objections to installing this on the emacs-29 >> branch? > > I have none. There were just come complains last time, because we made > the change too soon, so I believe the consensus was to wait for a bit > longer and then it was just forgotten. Oops, I misread this thread and was under the assumption you were responding to a different message. Sorry about that! Shouldn't write messages when I am in a hurry. Regarding Daniel's patch, I don't believe we need `file-name-directory' at all, the variable `docs-directory' is just passed to makeinfo -I, and to my knowledge it should make a difference if the argument ends with a directory delimiter or not. -- Philip Kaludercic