From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.devel Subject: Re: Removing packages from archive-contents if removed from elpa-packages Date: Wed, 02 Nov 2022 06:59:27 +0000 Message-ID: <871qqldepc.fsf@posteo.net> References: <878rkwe3fv.fsf@posteo.net> <87wn8ggjdo.fsf@posteo.net> <87bkpsgeq3.fsf@posteo.net> <87y1svgdlu.fsf@posteo.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="12990"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Nov 02 08:00:34 2022 Return-path: Envelope-to: ged-emacs-devel@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 1oq7jl-00039W-JW for ged-emacs-devel@m.gmane-mx.org; Wed, 02 Nov 2022 08:00:33 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oq7it-0008It-K2; Wed, 02 Nov 2022 02:59:39 -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 1oq7iq-0008Ij-Ey for emacs-devel@gnu.org; Wed, 02 Nov 2022 02:59:36 -0400 Original-Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oq7io-0005Vf-1j for emacs-devel@gnu.org; Wed, 02 Nov 2022 02:59:36 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 56A9D240026 for ; Wed, 2 Nov 2022 07:59:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1667372371; bh=7TRyBrguOqwEI9MtItHflCPBYB7oGiVcyrJ8wTyep/4=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=Yu3T5Sx9KdwvHh3T5l6hdWfZVls5UaJbqAgZaEaB+FxB8lyZ6caaSdfKMLndIaPXW fm76y34a52mxldD/kR/fxwend1hlQ/pKYUsbQc8y1tywN2Zw/mt29aPzwXmv8/bk1V QH4Fpz6C4ush19kkYpA6qdENIq9w42k8Bp7BbKcNPihhLn0msYzpXSG2kyfrE6NF6d j2FWiRE+UcnHxasBtiVyhkxCvF3LNGlRN2KAMgU/lbv+e5i8bTw0DDNQ//BY13/Z4F s7XpVeVaGG+huAMLnDRmvmdVLCQCgDF0q5mKQ6FrfdSUp46fKinxmivy/Zayx/X4bg lMQHu2whbMH2A== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4N2HnG2ZJZz6tnp; Wed, 2 Nov 2022 07:59:27 +0100 (CET) In-Reply-To: (Stefan Monnier's message of "Tue, 01 Nov 2022 22:02:04 -0400") Autocrypt: addr=philipk@posteo.net; prefer-encrypt=nopreference; keydata= mDMEYHHqUhYJKwYBBAHaRw8BAQdAp3GdmYJ6tm5McweY6dEvIYIiry+Oz9rU4MH6NHWK0Ee0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiQBBMWCAA4FiEEDM2H44ZoPt9Ms0eHtVrAHPRh1FwFAmBx6lICGwMFCwkIBwIGFQoJ CAsCBBYCAwECHgECF4AACgkQtVrAHPRh1FyTkgEAjlbGPxFchvMbxzAES3r8QLuZgCxeAXunM9gh io0ePtUBALVhh9G6wIoZhl0gUCbQpoN/UJHI08Gm1qDob5zDxnIHuDgEYHHqUhIKKwYBBAGXVQEF AQEHQNcRB+MUimTMqoxxMMUERpOR+Q4b1KgncDZkhrO2ql1tAwEIB4h4BBgWCAAgFiEEDM2H44Zo Pt9Ms0eHtVrAHPRh1FwFAmBx6lICGwwACgkQtVrAHPRh1Fw1JwD/Qo7kvtib8jy7puyWrSv0MeTS g8qIxgoRWJE/KKdkCLEA/jb9b9/g8nnX+UcwHf/4VfKsjExlnND3FrBviXUW6NcB Received-SPF: pass client-ip=185.67.36.65; envelope-from=philipk@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: "Emacs-devel" Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:298994 Archived-At: Stefan Monnier writes: >> No, you are absolutely right, I just didn't see that. >> >> From 62fa93b120f664f1be44c1194f701a1c5d965f2a Mon Sep 17 00:00:00 2001 >> From: Philip Kaludercic >> Date: Mon, 31 Oct 2022 17:01:07 +0100 >> Subject: [PATCH 1/2] Remove deleted packages from archive-contents >> >> * elpa-admin.el (elpaa--write-archive-contents): Extract from >> 'elpaa--update-archive-contents' >> (elpaa--update-archive-contents): Use 'elpaa--write-archive-contents'. >> (elpaa--scrub-archive-contents): Add function. >> (elpaa-batch-make-all-packages): Call 'elpaa--scrub-archive-contents'. >> --- >> elpa-admin.el | 31 ++++++++++++++++++++++++++----- >> 1 file changed, 26 insertions(+), 5 deletions(-) >> >> diff --git a/elpa-admin.el b/elpa-admin.el >> index c03fea47a1..12306ec818 100644 >> --- a/elpa-admin.el >> +++ b/elpa-admin.el >> @@ -154,6 +154,14 @@ Delete backup files also." >> (backup-file-name-p f)) >> (delete-file f))))) >> >> +(defun elpaa--write-archive-contents (ac dir) >> + "Write archive contents AC into directory DIR." >> + (with-temp-buffer >> + (pp ac (current-buffer)) >> + (write-region nil nil (expand-file-name "archive-contents" dir))) >> + (let ((default-directory (expand-file-name dir))) >> + (elpaa--html-make-index (cdr ac)))) >> + >> (defun elpaa--update-archive-contents (pkg-desc dir) >> "Update the `archive-contents' file in DIR with new package PKG-DESC." >> (let* ((filename (expand-file-name "archive-contents" dir)) >> @@ -166,11 +174,7 @@ Delete backup files also." >> (lambda (x y) >> (string-lessp (symbol-name (car x)) (symbol-name (car y)))))) >> (elpaa--message "new AC: %S" ac) >> - (with-temp-buffer >> - (pp ac (current-buffer)) >> - (write-region nil nil filename) >> - (let ((default-directory (expand-file-name dir))) >> - (elpaa--html-make-index (cdr ac)))))) >> + (elpaa--write-archive-contents ac dir))) >> >> (defun elpaa--get-specs () >> (elpaa--form-from-file-contents elpaa--specs-file)) >> @@ -788,6 +792,21 @@ of the current `process-environment'. Return the modified copy." >> (list pkgname)) >> spec))) >> >> +(defun elpaa--scrub-archive-contents (dir specs) >> + "Remove dead packages from archive contents in DIR. >> +SPECS is the list of package specifications." >> + (let* ((filename (expand-file-name "archive-contents" dir)) >> + (ac (if (file-exists-p filename) >> + (elpaa--form-from-file-contents filename) >> + '(1)))) >> + (elpaa--write-archive-contents >> + (cons (car ac) >> + (mapcan >> + (lambda (pkg) >> + (and (assoc (car pkg) specs #'string=) (list pkg))) >> + (cdr ac))) >> + dir))) > > LGTM. Feel free to push. Will do. > Just one comment: we could skip the > `elpaa--write-archive-contents` (and associated > `elpaa--html-make-index`) in the overwhelmingly common case where > nothing was scrubbed. Good point. > > Stefan