unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Lars Ingebrigtsen <larsi@gnus.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 42534@debbugs.gnu.org, 37615@debbugs.gnu.org,
	Artur Malabarba <bruce.connor.am@gmail.com>
Subject: bug#37615: bug#42534: 28.0.50; package-test-macro-compilation test fails on macOS
Date: Fri, 25 Dec 2020 22:43:24 +0100	[thread overview]
Message-ID: <871rfdef43.fsf@gnus.org> (raw)
In-Reply-To: <83tus9mxcm.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 25 Dec 2020 22:42:17 +0200")

The problem on Macos seems to be that it's comparing file-truenames, but
that's not what's in the load history.  For instance,
"/var/folders/l4/brbf3lnd693fpdl8bn87q5w80000gn/T/pkg-test-user-dir-FaftUD/macro-problem-1.0/macro-problem-autoloads"
is in load-history, but it's finding conflicts by truenaming:

(file-truename "/var/folders/l4/brbf3lnd693fpdl8bn87q5w80000gn/T/pkg-test-user-dir-FaftUD/macro-problem-1.0/macro-problem-autoloads")
=> "/private/var/folders/l4/brbf3lnd693fpdl8bn87q5w80000gn/T/pkg-test-user-dir-FaftUD/macro-problem-1.0/macro-problem-autoloads"

And indeed:

larsi@open-catalina test % ls -ld /var
lrwxr-xr-x@ 1 root  admin  11 Dec 18 15:11 /var -> private/var

The following seems to fix the problem for me on Macos and doesn't lead
to any breakages on Debian, so I'm pushing it now.  Can you check
whether this fixes the problem on Windows?

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 0170e61e12..bc450b09d0 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -830,7 +830,7 @@ package--files-load-history
         (mapcar (lambda (x)
                   (let ((f (car x)))
                     (and (stringp f)
-                         (file-name-sans-extension f))))
+                         (file-name-sans-extension (file-truename f)))))
                 load-history)))
 
 (defun package--list-of-conflicts (dir history)


-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no






  parent reply	other threads:[~2020-12-25 21:43 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-04  8:13 bug#37615: 27.0.50; package-test-macro-compilation fails Eli Zaretskii
2019-10-04  8:23 ` Stefan Kangas
2019-10-04  8:47   ` Robert Pluim
2019-10-04  8:55   ` Eli Zaretskii
2020-12-25  6:29 ` bug#37615: bug#42534: 28.0.50; package-test-macro-compilation test fails on macOS Lars Ingebrigtsen
2020-12-25  7:54   ` Eli Zaretskii
2020-12-25 19:37     ` Lars Ingebrigtsen
2020-12-25 20:42       ` Eli Zaretskii
2020-12-25 20:49         ` Lars Ingebrigtsen
2020-12-25 21:43         ` Lars Ingebrigtsen [this message]
2020-12-26  8:39           ` bug#37615: " Eli Zaretskii
2020-12-26 22:00             ` Lars Ingebrigtsen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=871rfdef43.fsf@gnus.org \
    --to=larsi@gnus.org \
    --cc=37615@debbugs.gnu.org \
    --cc=42534@debbugs.gnu.org \
    --cc=bruce.connor.am@gmail.com \
    --cc=eliz@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).