From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Joseph Turner via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#66115: [PATCH] Ensure that directory is expanded in package-vc-checkout Date: Fri, 22 Sep 2023 01:33:45 -0700 Message-ID: <871qeqppxm.fsf@breatheoutbreathe.in> References: <87a5thfh7i.fsf@breatheoutbreathe.in> <87lecyvcyd.fsf@posteo.net> Reply-To: Joseph Turner Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="25887"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 66115@debbugs.gnu.org To: Philip Kaludercic Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Sep 22 10:35:16 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 1qjbd4-0006RR-VU for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 22 Sep 2023 10:35:15 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjbcj-0006ji-LV; Fri, 22 Sep 2023 04:34:53 -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 1qjbch-0006jU-TL for bug-gnu-emacs@gnu.org; Fri, 22 Sep 2023 04:34:51 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qjbch-0008As-LF for bug-gnu-emacs@gnu.org; Fri, 22 Sep 2023 04:34:51 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qjbcr-0002Gf-Rx for bug-gnu-emacs@gnu.org; Fri, 22 Sep 2023 04:35:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Joseph Turner Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 22 Sep 2023 08:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66115 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 66115-submit@debbugs.gnu.org id=B66115.16953716598659 (code B ref 66115); Fri, 22 Sep 2023 08:35:01 +0000 Original-Received: (at 66115) by debbugs.gnu.org; 22 Sep 2023 08:34:19 +0000 Original-Received: from localhost ([127.0.0.1]:35286 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjbcB-0002Fa-3i for submit@debbugs.gnu.org; Fri, 22 Sep 2023 04:34:19 -0400 Original-Received: from out-218.mta0.migadu.com ([2001:41d0:1004:224b::da]:41432) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjbc7-0002FM-HW for 66115@debbugs.gnu.org; Fri, 22 Sep 2023 04:34:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=breatheoutbreathe.in; s=key1; t=1695371641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YezTbSQzqzXGucaqGRpod2SEdOcM4hTiVMw0u83QpUU=; b=IaojodDdbQFFRfCjD8TNr1qmW28piy7eNjw+0V8YtgnfeZnOTqPkiRX6Dv7B3PCJExM2T9 yQhU7fcijhibHIH96e0Ck2jibxeH/z2v23IP9ihP99b+TDD6VrCaAcMi70nO3XEYgR/gw6 xGEEqIh8aeMUTUH/d8Ki4JqZS4Thl7w= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. In-reply-to: <87lecyvcyd.fsf@posteo.net> X-Migadu-Flow: FLOW_OUT 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:271053 Archived-At: Philip Kaludercic writes: > Joseph Turner writes: > >> Tags: patch >> >> Tags: patch >> >> This patch fixes a serious bug which caused package-vc-checkout to fail >> entirely when its second argument `directory' was not expanded. >> >> From 75a6ec74ff5e31edc7592b68e7ad9d1ec26f515c Mon Sep 17 00:00:00 2001 >> From: Joseph Turner >> Date: Wed, 20 Sep 2023 00:12:10 -0700 >> Subject: [PATCH] Ensure that directory is expanded in package-vc-checkout >> >> * lisp/emacs-lisp/package-vc.el (package-vc-checkout) >> --- >> lisp/emacs-lisp/package-vc.el | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el >> index 29b540d86b8..47d8c996ff0 100644 >> --- a/lisp/emacs-lisp/package-vc.el >> +++ b/lisp/emacs-lisp/package-vc.el >> @@ -834,6 +834,7 @@ for the last released version of the package." >> (setf dir subdir) >> (user-error "Directory not empty: %S" (expand-file-name dir))))) >> (list desc dir (and current-prefix-arg :last-release)))) >> + (setf directory (expand-file-name directory)) >> (package-vc--archives-initialize) >> (let ((pkg-spec (or (package-vc--desc->spec pkg-desc) >> (and-let* ((extras (package-desc-extras pkg-desc)) > > DIRECTORY is passed on to `package-vc--clone' and in turn `vc-clone'. > Wouldn't it be more robust to ensure that `vc-clone' can handle > unexpanded directory names, eg. like this: > > diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el > index 2f4b028bb4a..7f334397a5e 100644 > --- a/lisp/vc/vc.el > +++ b/lisp/vc/vc.el > @@ -3676,8 +3676,7 @@ vc-clone > checkout. If BACKEND is nil, iterate through every known backend > in `vc-handled-backends' until one succeeds. If REV is non-nil, > it indicates a specific revision to check out." > - (unless directory > - (setq directory default-directory)) > + (setq directory (expand-file-name (or directory default-directory))) > (if backend > (progn > (unless (memq backend vc-handled-backends) Yes, certainly. Your solution is better.