all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Евгений Бойков via Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Philip Kaludercic <philipk@posteo.net>,
	63757@debbugs.gnu.org, monnier@iro.umontreal.ca
Subject: bug#63757: 29.0.91 order of package paths changed: random old versions of packages in load-path
Date: Sun, 4 Jun 2023 22:14:54 +1000	[thread overview]
Message-ID: <CAKOwOe7cSJ3hjdupmo+RA_R0_-wwyFykiDfLxJETJLyyvEosWA@mail.gmail.com> (raw)
In-Reply-To: <83pm6b5t1i.fsf@gnu.org>

[-- Attachment #1: Type: text/plain, Size: 7085 bytes --]

I've tested two other variants.

The simplest fix

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index ba0e3618f28..6eaf261f5f4 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -922,11 +922,13 @@ correspond to previously loaded files."
                                  (v2 (package-desc-version p2)))
                              (or
                               ;; Prefer VC packages.
-                              (package-vc-p p1)
-                              (package-vc-p p2)
+                              (and
+                               (package-vc-p p1)
+                               (not (package-vc-p p2)))
                               ;; Prefer builtin packages.
-                              (package-disabled-p p1 v1)
-                              (not (package-disabled-p p2 v2))))))))
+                              (and
+                               (package-built-in-p p1 v1)
+                               (not (package-built-in-p p2 v2)))))))))
     ;; Check if PACKAGE is available in `package-alist'.
     (while
         (when pkg-descs



"Move to package-process-define-package" variant

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index ba0e3618f28..c184625d754 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -686,7 +686,7 @@ Convert EXP into a `package-desc' object using the

 If there already exists a package by the same name in
 `package-alist', insert this object there such that the packages
-are sorted with the highest version first."
+are sorted with VC and builtin packages first and the highest version
second."
   (when (eq (car-safe exp) 'define-package)
     (let* ((new-pkg-desc (apply #'package-desc-from-define (cdr exp)))
            (name (package-desc-name new-pkg-desc))
@@ -696,13 +696,29 @@ are sorted with the highest version first."
           ;; If there's no old package, just add this to `package-alist'.
           (push (list name new-pkg-desc) package-alist)
         ;; If there is, insert the new package at the right place in the
list.
-        (while
-            (if (and (cdr old-pkgs)
-                     (version-list-< version
-                                     (package-desc-version (cadr
old-pkgs))))
-                (setq old-pkgs (cdr old-pkgs))
-              (push new-pkg-desc (cdr old-pkgs))
-              nil)))
+        (progn
+          ;; Prefer newer packages
+          (while
+              (if (and (cdr old-pkgs)
+                       (version-list-< version
+                                       (package-desc-version (cadr
old-pkgs))))
+                  (setq old-pkgs (cdr old-pkgs))
+                (push new-pkg-desc (cdr old-pkgs))
+                nil))
+          (let ((pkg-desc (sort (cdr (assq name package-alist))
+                                (lambda (p1 p2)
+                                  (let ((v1 (package-desc-version p1))
+                                        (v2 (package-desc-version p2)))
+                                    (or
+                                     (and
+                                      ;; Prefer VC packages.
+                                      (package-vc-p p1)
+                                      (not (package-vc-p p2)))
+                                     ;; Prefer builtin packages.
+                                     (and
+                                      (package-built-in-p p1 v1)
+                                      (not (package-built-in-p p2
v2)))))))))
+            (setq new-pkg-desc (car pkg-desc)))))
       new-pkg-desc)))

 (declare-function package-vc-commit "package-vc" (pkg))
@@ -916,17 +932,7 @@ correspond to previously loaded files."

 (defun package--get-activatable-pkg (pkg-name)
   ;; Is "activatable" a word?
-  (let ((pkg-descs (sort (cdr (assq pkg-name package-alist))
-                         (lambda (p1 p2)
-                           (let ((v1 (package-desc-version p1))
-                                 (v2 (package-desc-version p2)))
-                             (or
-                              ;; Prefer VC packages.
-                              (package-vc-p p1)
-                              (package-vc-p p2)
-                              ;; Prefer builtin packages.
-                              (package-disabled-p p1 v1)
-                              (not (package-disabled-p p2 v2))))))))
+  (let ((pkg-descs (cdr (assq pkg-name package-alist))))
     ;; Check if PACKAGE is available in `package-alist'.
     (while
         (when pkg-descs

On Sun, Jun 4, 2023 at 10:07 PM Eli Zaretskii <eliz@gnu.org> wrote:

> > From: Philip Kaludercic <philipk@posteo.net>
> > Cc: artscan@list.ru,  monnier@iro.umontreal.ca,  63757@debbugs.gnu.org
> > Date: Sun, 04 Jun 2023 11:39:53 +0000
> >
> > Eli Zaretskii <eliz@gnu.org> writes:
> >
> > > Is that a reverse diff or something?  The code we have now already
> > > does sort the list...
> >
> > No, the current code passes a non-nil NOSORT flag to `directory-files',
> > which inhibits sorting?
>
> I'm confused.  The code which the patch adds, viz.:
>
> >  (defun package--get-activatable-pkg (pkg-name)
> >    ;; Is "activatable" a word?
> > -  (let ((pkg-descs (cdr (assq pkg-name package-alist))))
> > +  (let ((pkg-descs (sort (cdr (assq pkg-name package-alist))
> > +                         (lambda (p1 p2)
> > +                           (let ((v1 (package-desc-version p1))
> > +                                 (v2 (package-desc-version p2)))
> > +                             (or
> > +                              ;; Prefer source packages.
> > +                              (eq (package-desc-kind p1) 'vc)
> > +                              (not (eq (package-desc-kind p2) 'vc))
> > +                              ;; Prefer builtin packages.
> > +                              (package-disabled-p p1 v1)
> > +                              (not (package-disabled-p p2 v2))))))))
> >      ;; Check if PACKAGE is available in `package-alist'.
>
> is already in the version of package.el on the emacs-29 branch.  And
> the code which the patch removes, viz.:
>
> >      ;; Check if PACKAGE is available in `package-alist'.
> >      (while
> >          (when pkg-descs
> >            (let ((available-version (package-desc-version (car
> pkg-descs))))
> > -            (or (package-disabled-p pkg-name available-version)
> > -                ;; Prefer a builtin package.
> > -                (package-built-in-p pkg-name available-version))))
> > +            (package-disabled-p pkg-name available-version)))
> >        (setq pkg-descs (cdr pkg-descs)))
> >      (car pkg-descs)))
>
> is already removed on the emacs-29 branch.
>
> What am I missing here?
>


-- 
__________________________

С уважением,
Бойков Евгений Алексеевич
сот. 8-924-202-25-65
e-mail: artscan@list.ru

[-- Attachment #2: Type: text/html, Size: 9503 bytes --]

  parent reply	other threads:[~2023-06-04 12:14 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-27 16:30 bug#63757: 29.0.91 order of package paths changed: random old versions of packages in load-path Евгений Бойков via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-05-29 11:09 ` Eli Zaretskii
2023-05-29 14:24   ` Philip Kaludercic
2023-06-03 10:19     ` Philip Kaludercic
2023-06-03 10:38       ` Eli Zaretskii
2023-06-03 11:50         ` Евгений Бойков via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-03 12:53           ` Евгений Бойков via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-03 13:33             ` Евгений Бойков via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-03 14:06       ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-04  4:46         ` Евгений Бойков via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-04  5:37           ` Евгений Бойков via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-04  5:41             ` Eli Zaretskii
2023-06-04  7:47               ` Philip Kaludercic
2023-06-04  8:03                 ` Eli Zaretskii
2023-06-04  9:19                   ` Philip Kaludercic
2023-06-04 10:14                     ` Eli Zaretskii
2023-06-04 11:39                       ` Philip Kaludercic
2023-06-04 12:08                         ` Eli Zaretskii
2023-06-04 12:12                           ` Philip Kaludercic
2023-06-04 12:19                             ` Eli Zaretskii
2023-06-04 12:32                               ` Philip Kaludercic
2023-06-04 12:46                                 ` Eli Zaretskii
2023-06-04 13:21                                   ` Philip Kaludercic
2023-06-04 14:03                                     ` Евгений Бойков via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-04 14:24                                       ` Philip Kaludercic
2023-06-04 14:30                                       ` Eli Zaretskii
2023-06-04 14:47                                         ` Евгений Бойков via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-04 14:55                                           ` Eli Zaretskii
2023-06-04 16:36                                             ` Евгений Бойков via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-04 15:12                                       ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-04 15:20                                         ` Eli Zaretskii
2023-06-04 15:47                                           ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-04 16:15                                             ` Philip Kaludercic
2023-06-04 16:30                                               ` Eli Zaretskii
2023-06-04 16:53                                                 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-04 17:37                                                   ` Philip Kaludercic
2023-06-04 18:32                                                     ` Eli Zaretskii
2023-06-04 16:44                                               ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-04 18:40                                                 ` Philip Kaludercic
2023-06-04 19:38                                                   ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-05  7:55                                                     ` Philip Kaludercic
2023-06-05 14:55                                                       ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-07 15:36                                                         ` Eli Zaretskii
2023-06-07 18:38                                                           ` Philip Kaludercic
2023-06-07 19:20                                                             ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-08  9:26                                                               ` Eli Zaretskii
2023-06-04 16:28                                             ` Eli Zaretskii
2023-06-04 15:45                                         ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-04 14:46                                   ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-04 14:54                                     ` Eli Zaretskii
2023-06-04 15:03                                     ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-04 12:14                           ` Евгений Бойков via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
2023-06-04  7:52               ` Евгений Бойков via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-04  8:06                 ` Eli Zaretskii
2023-06-04  8:43                   ` Евгений Бойков via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-04  8:54                     ` Eli Zaretskii
2023-06-04  9:10                       ` Ruijie Yu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-04  9:17                       ` Philip Kaludercic
2023-06-04 10:16                         ` Eli Zaretskii
2023-06-04  9:52                       ` Евгений Бойков via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-04 14:54           ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-05-29 13:25 ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-05-29 15:44   ` Евгений Бойков via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-05-30  2:44     ` Stefan Monnier via Bug reports for GNU Emacs, the Swiss army knife of text editors
2023-06-03  8:37       ` Eli Zaretskii

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

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

  git send-email \
    --in-reply-to=CAKOwOe7cSJ3hjdupmo+RA_R0_-wwyFykiDfLxJETJLyyvEosWA@mail.gmail.com \
    --to=bug-gnu-emacs@gnu.org \
    --cc=63757@debbugs.gnu.org \
    --cc=artscan@list.ru \
    --cc=eliz@gnu.org \
    --cc=monnier@iro.umontreal.ca \
    --cc=philipk@posteo.net \
    /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 external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.