From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#16762: Installed packages are not considered part of the archive contents Date: Sun, 23 Mar 2014 10:16:40 +0200 Message-ID: <532E9868.60207@yandex.ru> References: <87lhw4nj42.fsf@yandex.ru> <532CC639.6000309@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1395562643 21047 80.91.229.3 (23 Mar 2014 08:17:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 23 Mar 2014 08:17:23 +0000 (UTC) Cc: Johan Andersson , 16762@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Mar 23 09:17:28 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WRdat-0004cl-JL for geb-bug-gnu-emacs@m.gmane.org; Sun, 23 Mar 2014 09:17:23 +0100 Original-Received: from localhost ([::1]:59242 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WRdat-0006v9-3N for geb-bug-gnu-emacs@m.gmane.org; Sun, 23 Mar 2014 04:17:23 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52191) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WRdaj-0006v2-IT for bug-gnu-emacs@gnu.org; Sun, 23 Mar 2014 04:17:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WRdaZ-0000nS-2U for bug-gnu-emacs@gnu.org; Sun, 23 Mar 2014 04:17:13 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:44191) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WRdaY-0000nO-V0 for bug-gnu-emacs@gnu.org; Sun, 23 Mar 2014 04:17:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WRdaY-0003k7-96 for bug-gnu-emacs@gnu.org; Sun, 23 Mar 2014 04:17:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 23 Mar 2014 08:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 16762 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 16762-submit@debbugs.gnu.org id=B16762.139556260814349 (code B ref 16762); Sun, 23 Mar 2014 08:17:01 +0000 Original-Received: (at 16762) by debbugs.gnu.org; 23 Mar 2014 08:16:48 +0000 Original-Received: from localhost ([127.0.0.1]:45373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WRdaJ-0003jK-Fr for submit@debbugs.gnu.org; Sun, 23 Mar 2014 04:16:47 -0400 Original-Received: from mail-ee0-f43.google.com ([74.125.83.43]:55095) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1WRdaG-0003jB-FU for 16762@debbugs.gnu.org; Sun, 23 Mar 2014 04:16:45 -0400 Original-Received: by mail-ee0-f43.google.com with SMTP id e53so3249240eek.16 for <16762@debbugs.gnu.org>; Sun, 23 Mar 2014 01:16:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=XvUYzxOXXJ0ypSUUhZaDtSuamvzXsbYlixk9oHHT0vo=; b=hQ1KlNRT4hjQN/Nih001/8Vbpd6m9dRnPQEHTS9w52GncmXzxBgu6YQEKx2dWaz11T x2S9VSz5oHGEBcN1w/k+tGbv6csGEcXejhLKI+MpsaITy+umeYXZc/wcxDmSzweDSIyk 4j2uVcHfQsvGqpJTDkh1D/2nxHY62c//+2opHkgoTQQDm0P2MBvyf4eWEVjl/qOB/hvm DO3aiP25g3o+A9wpyrCtrQUYAkv/y5XtK2K26gXsqOp7bK7CDa4Plj+PnfddOeCli0u7 ono0HywWfUqVbiO7ISbtisBk649r536XQlE3xN/YVXOsnJPXXCrjAsCe4aQafXfwFwqe 8dkA== X-Received: by 10.15.81.135 with SMTP id x7mr54606670eey.61.1395562603761; Sun, 23 Mar 2014 01:16:43 -0700 (PDT) Original-Received: from [192.168.10.2] ([93.109.138.177]) by mx.google.com with ESMTPSA id e42sm24406491eev.32.2014.03.23.01.16.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 23 Mar 2014 01:16:42 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 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.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:87211 Archived-At: On 22.03.2014 04:46, Stefan Monnier wrote: > Yes, but as long as we don't know why this was done, it's too risky to > change it. If/when we figure out what that was about and come up with > a way to fix the problem, we can judge whether that's appropriate for > 24.4. From what I can see, except `package-install', all places where `package-archive-contents' is used, either append its contents to `package-alist' elements, or use a predicate calling `package-installed-p'. The following patch seems to offer the same functionality: === modified file 'lisp/emacs-lisp/package.el' --- lisp/emacs-lisp/package.el 2014-03-22 08:43:30 +0000 +++ lisp/emacs-lisp/package.el 2014-03-23 08:03:37 +0000 @@ -1047,14 +1047,11 @@ (existing-packages (assq name package-archive-contents)) (pinned-to-archive (assoc name package-pinned-packages))) (cond - ;; Skip entirely if pinned to another archive or already installed. + ;; Skip entirely if pinned to another archive or built-in. ((or (and pinned-to-archive (not (equal (cdr pinned-to-archive) archive))) (let ((bi (assq name package--builtin-versions))) - (and bi (version-list-= version (cdr bi)))) - (let ((ins (cdr (assq name package-alist)))) - (and ins (version-list-= version - (package-desc-version (car ins)))))) + (and bi (version-list-= version (cdr bi))))) nil) ((not existing-packages) (push (list name pkg-desc) package-archive-contents)) @@ -1090,8 +1087,11 @@ (package-refresh-contents)) (list (intern (completing-read "Install package: " - (mapcar (lambda (elt) (symbol-name (car elt))) - package-archive-contents) + (delq nil + (mapcar (lambda (elt) + (unless (package-installed-p (car elt)) + (symbol-name (car elt)))) + package-archive-contents)) nil t))))) (package-download-transaction (if (package-desc-p pkg)