From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#63757: 29.0.91 order of package paths changed: random old versions of packages in load-path Date: Sun, 04 Jun 2023 10:54:52 -0400 Message-ID: References: <83y1l7gzqw.fsf@gnu.org> <87ilcb2p1l.fsf@posteo.net> <87sfb8g85v.fsf@posteo.net> Reply-To: Stefan Monnier Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="34825"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Philip Kaludercic , 63757@debbugs.gnu.org, Eli Zaretskii To: =?UTF-8?Q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9_?= =?UTF-8?Q?=D0=91=D0=BE=D0=B9=D0=BA=D0=BE=D0=B2?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Jun 04 16:56:12 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 1q5p9Q-0008qR-NT for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 04 Jun 2023 16:56:12 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q5p9L-0005qk-O4; Sun, 04 Jun 2023 10:56:07 -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 1q5p9H-0005qM-OK for bug-gnu-emacs@gnu.org; Sun, 04 Jun 2023 10:56:04 -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 1q5p9G-0002UB-BJ for bug-gnu-emacs@gnu.org; Sun, 04 Jun 2023 10:56:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q5p9G-0004AN-7j for bug-gnu-emacs@gnu.org; Sun, 04 Jun 2023 10:56:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 04 Jun 2023 14:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63757 X-GNU-PR-Package: emacs Original-Received: via spool by 63757-submit@debbugs.gnu.org id=B63757.168589050215921 (code B ref 63757); Sun, 04 Jun 2023 14:56:02 +0000 Original-Received: (at 63757) by debbugs.gnu.org; 4 Jun 2023 14:55:02 +0000 Original-Received: from localhost ([127.0.0.1]:46881 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5p8I-00048i-Cy for submit@debbugs.gnu.org; Sun, 04 Jun 2023 10:55:02 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:5928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5p8F-00048B-Ub for 63757@debbugs.gnu.org; Sun, 04 Jun 2023 10:55:00 -0400 Original-Received: from pmg2.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 89E2F80626; Sun, 4 Jun 2023 10:54:54 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg2.iro.umontreal.ca (Proxmox) with ESMTP id 817D28028B; Sun, 4 Jun 2023 10:54:53 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1685890493; bh=GZOLstsDrsDQKg0Z3uWBAETmc6BskQtgAFB7MHOBDFc=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=XA504qjlTvDLd1lFsEtQMC4irzhI0ncB28U0q2TcIaWl846yqz4dIR19IkU8rRp/F b8KQVW5uQTO5ZnfE3Nq57oHuMH9mCNi5xtpDQeYRuDOhzXQZAazXtNF39MP1t+Hxw+ 8/75YKKU2GCOzpcNvz3lRAkEnspak+aXWJ+V48zt9FLyDDjOQok4f9ac/vkxLhyteN muzMN8BOZLfKZ/LdAJ/lQZ28hhxtmZ8YZvkqe87ryHSFBHnPl1/DPxK8eE0PoVg+Uu KGAZERidMV+4gC2Mhg3549nHssoYPkM2/5tacKMp3a6I3JEoo1OqbFp4bfGFWJzuMN 0RNjIg33ka0WA== Original-Received: from pastel (76-10-180-239.dsl.teksavvy.com [76.10.180.239]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 4A2661203F4; Sun, 4 Jun 2023 10:54:53 -0400 (EDT) In-Reply-To: ("=?UTF-8?Q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9_?= =?UTF-8?Q?=D0=91=D0=BE=D0=B9=D0=BA=D0=BE=D0=B2?="'s message of "Sun, 4 Jun 2023 14:46:14 +1000") 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:262961 Archived-At: > - (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)) > + ;; Prefer VC packages > + (let* ((pkg-desc0 (cdr (assq name package-alist))) > + (pkg-desc > + (apply 'append > + (cl-reduce > + (lambda (p1 p2) > + (if (package-vc-p p1) > + (push p1 (cl-first p2)) > + (push p1 (cl-second p2))) > + p2) > + pkg-desc0 > + :initial-value (list nil nil) > + :from-end t)))) > + (setf pkg-desc0 pkg-desc) > + (setq new-pkg-desc (car pkg-desc))))) Why 2 loops? The first loop is a kind of insertion sort, so what we want is simply to replace the (version-list-< version (package-desc-version (cadr old-pkgs))) test with one which places the VC packages first (tho I'm not sure why one would need that: presumably the version in the VC package will already be higher). [ BTW the speed of this code can be fairly important for people who don't use `package-quickstart`. I don't know if the added cost of the additional loop would be significant, but it's another reason to merge the two loops, I think. ] Stefan