From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Removing packages from archive-contents if removed from elpa-packages Date: Mon, 31 Oct 2022 13:53:18 -0400 Message-ID: References: <878rkwe3fv.fsf@posteo.net> <87wn8ggjdo.fsf@posteo.net> <87bkpsgeq3.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="7213"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: emacs-devel@gnu.org To: Philip Kaludercic Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Oct 31 18:54:02 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 1opYz3-0001gC-CJ for ged-emacs-devel@m.gmane-mx.org; Mon, 31 Oct 2022 18:54:01 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opYyV-0005zG-BO; Mon, 31 Oct 2022 13:53:27 -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 1opYyT-0005z4-F0 for emacs-devel@gnu.org; Mon, 31 Oct 2022 13:53:25 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opYyR-0004OV-S7 for emacs-devel@gnu.org; Mon, 31 Oct 2022 13:53:25 -0400 Original-Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id C10C710020F; Mon, 31 Oct 2022 13:53:21 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id AF1C810010E; Mon, 31 Oct 2022 13:53:19 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1667238799; bh=s29g1nZzqiU6NtW+VhwAWb0ufYP5tZqb3ol0fR3iuvs=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=WwAg4CucB/oTZiFhG4tmZZ3KA2nWYjsuqQQ3vauE6aq5FbO+qD+Gzpn//dEEzQOCz 3AjHTJDe1eqlBIHgYzlpCDrnLLy06nXSy2/lno/kBDjpvfL4Sfaj4mlXlkS8/KLs9L 3Ki3l+kXyFY2mloR2NRy3+Ynoh2Ta3Fb4CMGUxkKYbq0VNdrhtDyfrBVyuMVOPn4xU MIcPmQhX0pruYtq3Ct2cs5idjnA3v7CyhCO0qp2NKeaSJHTSTuwUcFEO5cqoYxxSc4 4OseZox3/ce/VUQJR/Y/km04vXnBAz99/lKY5hiJgAxkRPAURnEfszoQxDZbq622uN 4i0+8luJz26yQ== Original-Received: from lechazo (lechon.iro.umontreal.ca [132.204.27.242]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 846851202BC; Mon, 31 Oct 2022 13:53:19 -0400 (EDT) In-Reply-To: <87bkpsgeq3.fsf@posteo.net> (Philip Kaludercic's message of "Mon, 31 Oct 2022 16:06:12 +0000") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:298880 Archived-At: > +(defun elpaa--scrub-archive-contents (dir) > + "Remove dead packages from archive contents in DIR." > + (let* ((filename (expand-file-name "archive-contents" dir)) > + (ac (if (file-exists-p filename) > + (elpaa--form-from-file-contents filename) > + '(1))) > + (specs (elpaa--get-specs))) > + (elpaa--write-archive-contents > + (cons (car ac) > + (mapcan > + (lambda (pkg) > + (and (assoc (car pkg) specs #'string=) (list pkg))) > + (cdr ac))) > + dir))) > + > (defun elpaa--publish-package-specs (specs) > "Process and publish SPECS in elpa-packages.eld files." > (with-temp-buffer > @@ -814,6 +833,8 @@ of the current `process-environment'. Return the modified copy." > > (defun elpaa-batch-make-all-packages (&rest _) > "Check all the packages and build the relevant new tarballs." > + (elpaa--scrub-archive-contents elpaa--release-subdir) > + (elpaa--scrub-archive-contents elpaa--devel-subdir) > (let ((specs (elpaa--get-specs))) > (dolist (spec specs) > (condition-case err Hmm... in `elpaa--scrub-archive-contents` you `elpaa--get-specs` but you could skip that if you called this function a tiny bit later and passed `specs` to it instead, right? Stefan PS: Haven't really looked at the rest of the patch, actually, this part just jumped at me. But now that I see how this is more complex than your original patch, maybe doing it N times is the better option (and if not, we can add a global boolean var telling us if we've done it already).