Received: (at 79411) by debbugs.gnu.org; 25 Nov 2025 20:32:11 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Nov 25 15:32:11 2025 Received: from localhost ([127.0.0.1]:42363 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1vNzhp-00059v-CW for submit <at> debbugs.gnu.org; Tue, 25 Nov 2025 15:32:11 -0500 Received: from mr6.vodafonemail.de ([145.253.228.166]:33424) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <jschmidt4gnu@HIDDEN>) id 1vNdoS-00061I-Vp for 79411 <at> debbugs.gnu.org; Mon, 24 Nov 2025 16:09:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vodafonemail.de; s=vfde-mb-mr2-23sep; t=1764018566; bh=bCE7fJurLTg0bAPXVrvkFnizEm48GBWFlrb2pUVHchk=; h=Message-ID:Date:User-Agent:Subject:To:References:From: Content-Language:In-Reply-To:Content-Type:From; b=k9B66p95aBfX33ueOkrZaiv8XF3iJ/8QOrwcNPmhvZfCkL6qzbuIYpeDuqXywjR3K L/rGivusO4hdVMbl2DEXY5fdueeCHVBMFCSQfZcALhDx/cv7ICOe2BVbHdQWFg0zJY 7pX54Jfv7G6XelQja48PtwxW05jRe22sCXUpBCU4= Received: from smtp.vodafone.de (unknown [10.0.0.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by mr6.vodafonemail.de (Postfix) with ESMTPS id 4dFdjy0VYDz1yDv; Mon, 24 Nov 2025 21:09:25 +0000 (UTC) Received: from [192.168.178.41] (unknown [195.52.29.84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.vodafone.de (Postfix) with ESMTPSA id 4dFdjs6Nqbz8sWv; Mon, 24 Nov 2025 21:09:18 +0000 (UTC) Message-ID: <2b47e8f1-ea9c-4b27-b02c-7b5bd13d3e7c@HIDDEN> Date: Mon, 24 Nov 2025 22:09:18 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#79411: 31.0.50; describe-package does not show :readme after package installation, but sth else To: Philip Kaludercic <philipk@HIDDEN> References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN> <8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN> <796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN> <871pocr7ot.fsf@HIDDEN> <86wm648utt.fsf@HIDDEN> <87wm64owhk.fsf@HIDDEN> <8d75da04-15d7-4c40-bb09-912b02aee492@HIDDEN> <877by2y6u0.fsf@HIDDEN> <37f04165-802f-4bd8-9762-8e79ec55dd08@HIDDEN> <87tszuyc7y.fsf@HIDDEN> <8066c764-ea05-40f1-9d99-d8cf129dbdb4@HIDDEN> <87tszlstnt.fsf@HIDDEN> <84a9b4d9-d9a7-4644-b3a9-b95b3e6ae92d@HIDDEN> <87ldjwiyoz.fsf@HIDDEN> From: Jens Schmidt <jschmidt4gnu@HIDDEN> Content-Language: de-DE-frami, en-US In-Reply-To: <87ldjwiyoz.fsf@HIDDEN> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-purgate-type: clean X-purgate: clean X-purgate-size: 1907 X-purgate-ID: 155817::1764018565-27FB3F52-469F95E5/0/0 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 79411 Cc: 79411 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Philip Kaludercic <philipk@HIDDEN> writes: > Once again, I am sorry for the delay in responding! Not at all, thanks for your thorough review. I'm fine with most of your comments, only you lost me here: >> (package-test-install-multifile): Move file tests out of >> `with-temp-buffer'. > > I am not sure if we have discussed this, but in any case it would be > good to explain "why" moving this makes sense. We haven't discussed this, and I don't have any better explanation for moving them out of the `with-temp-buffer' than that it is not really needed and, hence, feels cleaner to have them out of it. (Honestly, I feel a bit like a pupil before an inquisitory teacher here :-) > Overall the changes look good. I think the main thing to improve is > to revise the commit messages to be less descriptive and more > explanatory, but other than that and the few minor points I made here or > there, we are good to go. And this feels a bit like school, too. Do you want me to put more prose in the commit messages? More concretely, the only reason for any of the changes below I can see is "it's better that way": >> From: Jens Schmidt <jschmidt4gnu@HIDDEN> >> >> * test/lisp/emacs-lisp/package-tests.el (with-package-test): Remove >> unused keyword :update-news and its implementation. "Because it's good to churn unused code." >> Add documentation for remaining keywords. "Because it's good to add documentation, when there is none." >> Redo implementation of keyword :upload-base to use equivalent macro >> `ert-with-temp-directory' macro. "Because it's good to reduce code redundancy." >> Implement other minor improvements. Etc. Please don't get me wrong here, I'm not offended or whatever, I just don't understand what you expect from me. Probably you could redo one of the messages to show what you mean. Thanks!
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.
Received: (at 79411) by debbugs.gnu.org; 25 Nov 2025 20:22:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Nov 25 15:22:25 2025
Received: from localhost ([127.0.0.1]:41902 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1vNzYL-00015d-8I
for submit <at> debbugs.gnu.org; Tue, 25 Nov 2025 15:22:25 -0500
Received: from mout02.posteo.de ([185.67.36.66]:45111)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <philipk@HIDDEN>)
id 1vNBX2-00048A-QI
for 79411 <at> debbugs.gnu.org; Sun, 23 Nov 2025 09:57:45 -0500
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 64014240101
for <79411 <at> debbugs.gnu.org>; Sun, 23 Nov 2025 15:57:34 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=posteo.net; s=2017;
t=1763909854; bh=VTbqVRzvoL2evjQMOKIxzEjR31TydZ2/4SmFwr2mL04=;
h=From:To:Cc:Subject:OpenPGP:Date:Message-ID:MIME-Version:
Content-Type:From;
b=YpOgLOGH1RIArCnew6kFyCNu5TaTVwzoUYnqPa1hZ0q0+SCjhe+Oh/gmpJ85neWsp
V1BEU0WTt3OV/OA/d4FY3HSHHdwYZr5wnZyweBb70JRbl5nv6lxAR6KHzrFrLZX10J
kKoGnF3Gd+vcR8s9HrVuLPWdf1lS0OyO8ccQyao/u8Gchi/SKtYx1oQxSXPHFXP/wJ
q73idg4SBlzmjHcgMd0thGd4o0jDLRYHf8CaFVnA3bfXbHKZer59EgODax76UdrcGA
PdSas0XoeyvfzqVb1311kU1NpIR/NbtURd8jJImwLtkKb12G8SOhvmgX2wlr9cIwPN
t0mocXE1yzwng==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4dDsWK4T6Qz6twv;
Sun, 23 Nov 2025 15:57:33 +0100 (CET)
From: Philip Kaludercic <philipk@HIDDEN>
To: Jens Schmidt <jschmidt4gnu@HIDDEN>
Subject: Re: bug#79411: 31.0.50; describe-package does not show :readme
after package installation, but sth else
In-Reply-To: <84a9b4d9-d9a7-4644-b3a9-b95b3e6ae92d@HIDDEN>
References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN>
<8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN>
<796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN>
<871pocr7ot.fsf@HIDDEN> <86wm648utt.fsf@HIDDEN>
<87wm64owhk.fsf@HIDDEN>
<8d75da04-15d7-4c40-bb09-912b02aee492@HIDDEN>
<877by2y6u0.fsf@HIDDEN>
<37f04165-802f-4bd8-9762-8e79ec55dd08@HIDDEN>
<87tszuyc7y.fsf@HIDDEN>
<8066c764-ea05-40f1-9d99-d8cf129dbdb4@HIDDEN>
<87tszlstnt.fsf@HIDDEN>
<84a9b4d9-d9a7-4644-b3a9-b95b3e6ae92d@HIDDEN>
OpenPGP: id=7126E1DE2F0CE35C770BED01F2C3CC513DB89F66;
url="https://keys.openpgp.org/vks/v1/by-fingerprint/7126E1DE2F0CE35C770BED01F2C3CC513DB89F66";
preference=signencrypt
Date: Sun, 23 Nov 2025 14:57:33 +0000
Message-ID: <87ldjwiyoz.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 79411
Cc: 79411 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
Once again, I am sorry for the delay in responding!
Jens Schmidt <jschmidt4gnu@HIDDEN> writes:
> Philip Kaludercic <philipk@HIDDEN> writes:
>
>> Oh, don't remind me that other people are reading along ^^
>
> Until recently I considered that discussion to be one of the more
> fruitful ones on emacs-devel, really. Now I'm loosing track of the
> various proposals ...
If you are interested, the summary is that we extended cond* with a
bind-and* keyword (already in master), but we might still change some
minor details.
>>> Here is what I would do, one commit per list item, with references
>>> to my replies below.
>>>
>>> 1. The changes related to my bug [1].
>>>
>>> 2. My changes to function `with-package-test' plus your comment
>>> on `(cd ,basedir)' [2].
>>>
>>> 3. The typo I spotted and other minor unrelated changes [3].
>>>
>>> 4. (Optionally) breaking up long lines not originating from my
>>> code.
>>
>> Having this is a separate commit is probably not necessary, but it
>> really depends on how much you end up re-structuring the code. There is
>> a point at which Git's line-oriented version history becomes inadequate
>> and we have to accept that fact.
>
> I implemented (almost) all changes as discussed on a recent master in
> three commits and tested them. I did not yet wrap any long lines not
> related to my changes. If the following pattern for wrapping such lines
> looks OK to you, I can do the remaining lines as well, in yet another
> commit.
>
> +(ert-deftest package-test-describe-installed-with-ws-only-readme ()
> + "Test displaying of the readme for installed package with ws-only readme."
> [...]
> + (should
> + (search-forward "Package simple-single is installed." nil t))
> + (save-excursion
> + (should
> + (search-forward "This package provides a minor mode to frobnicate"
> + nil t)))
> + (save-excursion
> + (should-not
> + (search-forward "This is a server readme file." nil t)))))))
>
>> If it makes sense to change it along with the commit, that is fine.
>> BTW, I can also make adjustment to your patches just before pushing them
>> as long as you are fine with them, so we don't have to perfect and
>> pre-discuss everything.
>
> Sure.
>
>>> Right, but that's a typo, anyway, and one that renders the
>>> test useless. So stuff it into [3]?
>>
>> Oh, my bad, I misunderstood that this affects the test. Then you should
>> certainly fix it. Depending on what the other changes are in [3], it
>> might also be "critical" enough to have in a separate commit.
>
> Made it a separate commit.
>
> Please let me know how to continue here.
>
> Thanks!
>
> From 23189c01f22aca1594af92c41c21fdccd6a56ca2 Mon Sep 17 00:00:00 2001
> From: Jens Schmidt <farblos@HIDDEN>
> Date: Fri, 31 Oct 2025 20:41:50 +0100
> Subject: [PATCH 1/3] Use a consistent package description
>
> From: Jens Schmidt <jschmidt4gnu@HIDDEN>
>
> Ensure that the long description of a package is the same regardless of
> originating package archive and package installation state.
>
> * lisp/emacs-lisp/package.el: Add documentation on additional files that
> Emacs creates during package installation.
> (package-desc): Update description of slot `kind'.
> (package-install-from-archive): Download '*-readme.txt' from the archive
> and save it as 'README-elpa'.
> * test/lisp/emacs-lisp/package-resources/multi-file-readme.txt:
> * test/lisp/emacs-lisp/package-resources/simple-single-readme.txt:
> Update readmes to mark them as "server readmes" and distinguish them
> from what the packages themselves provide in their documentation.
> * test/lisp/emacs-lisp/package-tests.el (package-test-install-singlefile)
> (package-test-describe-installed-with-ws-only-readme): Add tests.
> (package-test-install-multifile): Test more files for presence.
> (package-test-describe-package)
> (package-test-describe-installed-multi-file-package)
> (package-test-describe-non-installed-package)
> (package-test-describe-non-installed-multi-file-package): Test for
> server readme being used as long description. (Bug#79411)
> ---
> lisp/emacs-lisp/package.el | 33 +++++++-
> .../package-resources/multi-file-readme.txt | 2 +-
> .../simple-single-readme.txt | 1 +
> test/lisp/emacs-lisp/package-tests.el | 82 ++++++++++++++++++-
> 4 files changed, 111 insertions(+), 7 deletions(-)
>
> diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
> index 63124706e28..5b9736ca5cf 100644
> --- a/lisp/emacs-lisp/package.el
> +++ b/lisp/emacs-lisp/package.el
> @@ -516,7 +516,9 @@ package-vc-p
> required version.
>
> `kind' The distribution format of the package. Currently, it is
> - either `single' or `tar'.
> + either `single', `tar', or (temporarily only) `dir'. In
> + addition, there is distribution format `vc', which is handled
> + by package-vc.el.
>
> `archive' The name of the archive (as a string) whence this
> package came.
> @@ -2113,6 +2115,18 @@ package--sort-by-dependence
> ;; installed in a variety of ways (archives, buffer, file), but
> ;; requirements (dependencies) are always satisfied by looking in
> ;; `package-archive-contents'.
> +;;
> +;; If Emacs installs a package from a package archive, it might create
> +;; some files in addition to the package's contents. For example:
> +;;
> +;; - If the package archive provides a non-trivial long description for
> +;; some package in "PACKAGE-readme.txt", Emacs stores it in a file
> +;; named "README-elpa" in the package's content directory, unless the
> +;; package itself provides such a file.
> +;;
> +;; - If a package archive provides package signatures, Emacs stores
> +;; information on the signatures in files named "NAME-VERSION.signed"
> +;; below directory `package-user-dir'.
>
> (defun package-archive-base (desc)
> "Return the package described by DESC."
> @@ -2162,7 +2176,22 @@ package-install-from-archive
> ;; Update the new (activated) pkg-desc as well.
> (when-let* ((pkg-descs (cdr (assq (package-desc-name pkg-desc)
> package-alist))))
> - (setf (package-desc-signed (car pkg-descs)) t))))))))))
> + (setf (package-desc-signed (car pkg-descs)) t))))))))
> + ;; fetch a backup of the readme file from the server. Slot `dir' is
> + ;; not yet available in PKG-DESC, so cobble that up.
> + (let* ((dirname (package-desc-full-name pkg-desc))
> + (pkg-dir (expand-file-name dirname package-user-dir))
> + (readme (expand-file-name "README-elpa" pkg-dir)))
> + (unless (file-readable-p readme)
> + (package--with-response-buffer (package-archive-base pkg-desc)
> + :file (format "%s-readme.txt" (package-desc-name pkg-desc))
> + :noerror t
> + ;; do not write empty or whitespace-only readmes to give
> + ;; `package--get-description' a chance to find another readme
> + (unless (save-excursion
> + (goto-char (point-min))
> + (looking-at-p "[[:space:]]*\\'"))
> + (write-region nil nil readme)))))))
>
> ;;;###autoload
> (defun package-installed-p (package &optional min-version)
> diff --git a/test/lisp/emacs-lisp/package-resources/multi-file-readme.txt b/test/lisp/emacs-lisp/package-resources/multi-file-readme.txt
> index affd2e96fb0..d35471eaf97 100644
> --- a/test/lisp/emacs-lisp/package-resources/multi-file-readme.txt
> +++ b/test/lisp/emacs-lisp/package-resources/multi-file-readme.txt
> @@ -1 +1 @@
> -This is a bare-bones readme file for the multi-file package.
> +This is a bare-bones server readme file for the multi-file package.
> diff --git a/test/lisp/emacs-lisp/package-resources/simple-single-readme.txt b/test/lisp/emacs-lisp/package-resources/simple-single-readme.txt
> index 25d3034032b..fa0662937f7 100644
> --- a/test/lisp/emacs-lisp/package-resources/simple-single-readme.txt
> +++ b/test/lisp/emacs-lisp/package-resources/simple-single-readme.txt
> @@ -1,3 +1,4 @@
> This package provides a minor mode to frobnicate and/or bifurcate
> any flanges you desire. To activate it, type "C-M-r M-3 butterfly"
> and all your dreams will come true.
> +This is a server readme file.
> diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el
> index f22051774c8..65e9a3a5191 100644
> --- a/test/lisp/emacs-lisp/package-tests.el
> +++ b/test/lisp/emacs-lisp/package-tests.el
> @@ -466,6 +466,33 @@ package-test-install-prioritized
> (should (version-list-= '(1 3)
> (package-desc-version installed)))))))
>
> +(ert-deftest package-test-install-singlefile ()
> + "Check properties of the installed single-file package."
> + (with-package-test (:install '(simple-single))
> + (let ((autoload-file
> + (expand-file-name "simple-single-autoloads.el"
> + (expand-file-name
> + "simple-single-1.3"
> + package-test-user-dir)))
> + (installed-files '("README-elpa"
> + "simple-single-autoloads.el"
> + "simple-single-pkg.el"
> + "simple-single.elc"))
> + (autoload-forms '("^(autoload 'simple-single-mode"))
> + (pkg-dir (file-name-as-directory
> + (expand-file-name
> + "simple-single-1.3"
> + package-test-user-dir))))
> + (package-refresh-contents)
> + (should (package-installed-p 'simple-single))
> + (dolist (fn installed-files)
> + (should (file-exists-p (expand-file-name fn pkg-dir))))
> + (with-temp-buffer
> + (insert-file-contents-literally autoload-file)
> + (dolist (re autoload-forms)
> + (goto-char (point-min))
> + (should (re-search-forward re nil t)))))))
> +
> (ert-deftest package-test-install-multifile ()
> "Check properties of the installed multi-file package."
> (with-package-test (:basedir (ert-resource-directory) :install '(multi-file))
> @@ -474,8 +501,13 @@ package-test-install-multifile
> (expand-file-name
> "multi-file-0.2.3"
> package-test-user-dir)))
> - (installed-files '("dir" "multi-file.info" "multi-file-sub.elc"
> - "multi-file-autoloads.el" "multi-file.elc"))
> + (installed-files '(;; already present in tar
> + "README" "dir" "multi-file.info"
> + ;; generated during installation
> + "README-elpa"
> + "multi-file-autoloads.el"
> + "multi-file-sub.elc"
> + "multi-file.elc"))
> (autoload-forms '("^(defvar multi-file-custom-var"
> "^(custom-autoload 'multi-file-custom-var"
> "^(autoload 'multi-file-mode"))
> @@ -695,6 +727,17 @@ package-test-package-installed-p
> (should (package-installed-p 'project nil))
> (should (not (package-installed-p 'imaginary-package nil)))))
>
> +;; The long description of installed packages should primarily come from
> +;; the package archive through file *-readme.txt stored in README-elpa,
> +;; and not from any README (or commentary) of the package itself. So
> +;; below we intentionally test for the contents of files *-readme.txt
> +;; ("*server* readme"), which differs from what the simple-single-1.3.el
> +;; or multi-file-0.2.3.tar/README contain.
> +;;
> +;; If the package archive provides a whitespace-only file *-readme.txt,
> +;; then that should *not* be used as README-elpa, so that
> +;; `describe-package' tries to come up with something reasonable itself.
> +
> (ert-deftest package-test-describe-package ()
> "Test displaying help for a package."
>
> @@ -725,8 +768,37 @@ package-test-describe-package
> (save-excursion (should (re-search-forward "Keywords: \\[?frobnicate\\]?" nil t)))
> (save-excursion (should (search-forward "This package provides a minor mode to frobnicate"
> nil t)))
> + (save-excursion (should (search-forward "This is a server readme file."
> + nil t)))
> )))
>
> +(ert-deftest package-test-describe-installed-with-ws-only-readme ()
> + "Test displaying of the readme for installed package with ws-only readme."
> +
> + (ert-with-temp-directory temp-archive
> + (copy-file (ert-resource-file "archive-contents") temp-archive)
> + (copy-file (ert-resource-file "simple-single-1.3.el") temp-archive)
> + (with-temp-buffer
> + (insert " \t\n\t \n")
> + (write-region nil nil (expand-file-name "simple-single-readme.txt"
You don't need to create a temporary buffer here, you can just pass the
string as the first argument:
If START is a string, then output that string to the file
instead of any buffer contents; END is ignored.
> + temp-archive)))
> + (with-package-test (:location temp-archive)
> + (package-initialize)
> + (package-refresh-contents)
> + (package-install 'simple-single)
> + (with-fake-help-buffer
> + (describe-package 'simple-single)
> + (goto-char (point-min))
> + (should
> + (search-forward "Package simple-single is installed." nil t))
> + (save-excursion
> + (should
> + (search-forward "This package provides a minor mode to frobnicate"
> + nil t)))
> + (save-excursion
> + (should-not
> + (search-forward "This is a server readme file." nil t)))))))
> +
> (ert-deftest package-test-describe-installed-multi-file-package ()
> "Test displaying of the readme for installed multi-file package."
>
> @@ -738,7 +810,7 @@ package-test-describe-installed-multi-file-package
> (describe-package 'multi-file)
> (goto-char (point-min))
> (should (search-forward "Website: http://puddles.li" nil t))
> - (should (search-forward "This is a bare-bones readme file for the multi-file"
> + (should (search-forward "This is a bare-bones server readme file for the multi-file"
> nil t)))))
>
> (ert-deftest package-test-describe-non-installed-package ()
> @@ -752,6 +824,8 @@ package-test-describe-non-installed-package
> (goto-char (point-min))
> (should (search-forward "Website: http://doodles.au" nil t))
> (should (search-forward "This package provides a minor mode to frobnicate"
> + nil t))
> + (should (search-forward "This is a server readme file."
> nil t)))))
>
> (ert-deftest package-test-describe-non-installed-multi-file-package ()
> @@ -764,7 +838,7 @@ package-test-describe-non-installed-multi-file-package
> (describe-package 'multi-file)
> (goto-char (point-min))
> (should (search-forward "Website: http://puddles.li" nil t))
> - (should (search-forward "This is a bare-bones readme file for the multi-file"
> + (should (search-forward "This is a bare-bones server readme file for the multi-file"
> nil t)))))
>
> (defvar epg-config--program-alist) ; Silence byte-compiler.
> --
> 2.39.5
>
>
> From 067d12f4e44904849d7ec10c7f65f8654d4df1fe Mon Sep 17 00:00:00 2001
> From: Jens Schmidt <farblos@HIDDEN>
> Date: Fri, 31 Oct 2025 21:14:27 +0100
> Subject: [PATCH 2/3] ; Fix a test-relevant typo
>
> From: Jens Schmidt <jschmidt4gnu@HIDDEN>
>
> * test/lisp/emacs-lisp/package-tests.el (package-test-install-file): Fix
> a test-relevant typo.
> ---
> test/lisp/emacs-lisp/package-tests.el | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el
> index 65e9a3a5191..b893e6fce1b 100644
> --- a/test/lisp/emacs-lisp/package-tests.el
> +++ b/test/lisp/emacs-lisp/package-tests.el
> @@ -281,7 +281,7 @@ package-test-install-file
>
> (let* ((pkg-el "multi-file-0.2.3.tar")
> (source-file (expand-file-name pkg-el (ert-resource-directory))))
> - (should-not (package-installed-p 'multie-file))
> + (should-not (package-installed-p 'multi-file))
> (package-install-file source-file)
> (should (package-installed-p 'multi-file))
> (package-delete (cadr (assq 'multi-file package-alist))))))
> --
> 2.39.5
>
>
> From e39b294b07c19f860c920f2df4e4b5a94da1d7af Mon Sep 17 00:00:00 2001
> From: Jens Schmidt <farblos@HIDDEN>
> Date: Sat, 8 Nov 2025 21:01:21 +0100
> Subject: [PATCH 3/3] Brush up macro with-package-test and related tests
>
> From: Jens Schmidt <jschmidt4gnu@HIDDEN>
>
> * test/lisp/emacs-lisp/package-tests.el (with-package-test): Remove
> unused keyword :update-news and its implementation. Add documentation
> for remaining keywords. Redo implementation of keyword :upload-base to
> use equivalent macro `ert-with-temp-directory' macro. Implement other
> minor improvements.
> (package-test-install-file, package-test-bug58367, package-test-bug65475)
> (package-test-install-file-EOLs, package-test-install-multifile): Remove
> superfluous :basedir keyword from `with-package-test' calls.
> (package-test-install-multifile): Move file tests out of
> `with-temp-buffer'.
I am not sure if we have discussed this, but in any case it would be
good to explain "why" moving this makes sense.
> ---
> test/lisp/emacs-lisp/package-tests.el | 91 +++++++++++++--------------
> 1 file changed, 45 insertions(+), 46 deletions(-)
>
> diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el
> index b893e6fce1b..266201ff459 100644
> --- a/test/lisp/emacs-lisp/package-tests.el
> +++ b/test/lisp/emacs-lisp/package-tests.el
> @@ -110,10 +110,30 @@ with-package-test
> basedir
> install
> location
> - update-news
> upload-base)
> &rest body)
> - "Set up temporary locations and variables for testing."
> + "Set up temporary locations and variables for testing.
> +Create a temporary buffer and execute BODY in it.
> +
> +This macro interprets the following keywords:
> +
> +:basedir BASEDIR - Bind default directory to BASEDIR in the temporary
> + buffer before executing BODY.
> + You should use keyword :basedir only when BODY or FILE requires it;
> + this macro itself does not require its usage.
> +
> +:file FILE - Execute `insert-file-contents' on FILE in the temporary buffer
> + before executing BODY.
> +
> +:install PACKAGES - Execute `package-install' on each package in list
> + PACKAGES before executing BODY.
> +
> +:location ARCHIVE-DIR - Use directory ARCHIVE-DIR as package archive
> + directory instead of `package-test-user-dir'.
> +
> +:upload-base UPDATE-BASE - If UPDATE-BASE is non-nil, create a temporary
> + directory, bind `package-archive-upload-base' to the location of that
> + while executing BODY, and clean it up after that."
> (declare (indent 1) (debug (([&rest form]) body)))
> `(ert-with-temp-directory package-test-user-dir
> (let* ((process-environment (cons (format "HOME=%s" package-test-user-dir)
> @@ -125,46 +145,25 @@ with-package-test
> abbreviated-home-dir
> package--initialized
> package-alist
> - package-selected-packages
> - ,@(if update-news
> - '(package-update-news-on-upload t)
> - (list (gensym)))
> - ,@(if upload-base
> - '((package-test-archive-upload-base (make-temp-file "pkg-archive-base-" t))
> - (package-archive-upload-base package-test-archive-upload-base))
> - (list (gensym)))) ;; Dummy value so `let' doesn't try to bind nil
> + package-selected-packages)
> (let ((buf (get-buffer "*Packages*")))
> (when (buffer-live-p buf)
> (kill-buffer buf)))
> - (unwind-protect
> - (progn
> - ,(if basedir `(cd ,basedir))
> - (unless (file-directory-p package-user-dir)
> - (mkdir package-user-dir))
> - (cl-letf (((symbol-function 'yes-or-no-p) (lambda (&rest _) t))
> - ((symbol-function 'y-or-n-p) (lambda (&rest _) t)))
> - ,@(when install
> - `((package-initialize)
> - (package-refresh-contents)
> - (mapc 'package-install ,install)))
> - (with-temp-buffer
> - ,(if file
> - `(insert-file-contents ,file))
> - ,@body)))
> -
> - (when ,upload-base
> - (dolist (f '("archive-contents"
> - "simple-single-1.3.el"
> - "simple-single-1.4.el"
> - "simple-single-readme.txt"))
> - (ignore-errors
> - (delete-file
> - (expand-file-name f package-test-archive-upload-base))))
> - (delete-directory package-test-archive-upload-base))
> -
> - (when (and (boundp 'package-test-archive-upload-base)
> - (file-directory-p package-test-archive-upload-base))
> - (delete-directory package-test-archive-upload-base t))))))
> + (unless (file-directory-p package-user-dir)
> + (mkdir package-user-dir))
`Mkdir' is an alias, I'd use `make-directory' instead.
> + (cl-letf (((symbol-function 'y-or-n-p) (lambda (&rest _) t)))
You don't need a lambda expression here, you can rebind it to `always'
> + ,@(when install
> + `((package-initialize)
> + (package-refresh-contents)
> + (mapc 'package-install ,install)))
Please sharp-quote the symbol!
> + (with-temp-buffer
> + (let ,(if basedir `((default-directory ,basedir)) '())
> + ,(if file
> + `(insert-file-contents ,file))
> + ,(if upload-base
> + `(ert-with-temp-directory package-archive-upload-base
> + ,@body)
> + `(progn ,@body))))))))
>
> (defmacro with-fake-help-buffer (&rest body)
> "Execute BODY in a temp buffer which is treated as the \"*Help*\" buffer."
> @@ -269,7 +268,7 @@ package-test-install-single
>
> (ert-deftest package-test-install-file ()
> "Install files with `package-install-file'."
> - (with-package-test (:basedir (ert-resource-directory))
> + (with-package-test ()
> (package-initialize)
> (let* ((pkg-el "simple-single-1.3.el")
> (source-file (expand-file-name pkg-el (ert-resource-directory))))
> @@ -288,7 +287,7 @@ package-test-install-file
>
> (ert-deftest package-test-bug58367 ()
> "Check variations in tarball formats."
> - (with-package-test (:basedir (ert-resource-directory))
> + (with-package-test ()
> (package-initialize)
>
> ;; A package whose first entry is the main dir but without trailing /.
> @@ -310,7 +309,7 @@ package-test-bug58367
>
> (ert-deftest package-test-bug65475 ()
> "Deleting the last package clears `package-selected-packages'."
> - (with-package-test (:basedir (ert-resource-directory))
> + (with-package-test ()
> (package-initialize)
> (let* ((pkg-el "simple-single-1.3.el")
> (source-file (expand-file-name pkg-el (ert-resource-directory))))
> @@ -326,7 +325,7 @@ package-test-bug65475
> (ert-deftest package-test-install-file-EOLs ()
> "Install same file multiple time with `package-install-file'
> but with a different end of line convention (bug#48137)."
> - (with-package-test (:basedir (ert-resource-directory))
> + (with-package-test ()
> (package-initialize)
> (let* ((pkg-el "simple-single-1.3.el")
> (source-file (expand-file-name pkg-el (ert-resource-directory))))
> @@ -495,7 +494,7 @@ package-test-install-singlefile
>
> (ert-deftest package-test-install-multifile ()
> "Check properties of the installed multi-file package."
> - (with-package-test (:basedir (ert-resource-directory) :install '(multi-file))
> + (with-package-test (:install '(multi-file))
> (let ((autoload-file
> (expand-file-name "multi-file-autoloads.el"
> (expand-file-name
> @@ -517,10 +516,10 @@ package-test-install-multifile
> package-test-user-dir))))
> (package-refresh-contents)
> (should (package-installed-p 'multi-file))
> + (dolist (fn installed-files)
> + (should (file-exists-p (expand-file-name fn pkg-dir))))
> (with-temp-buffer
> (insert-file-contents-literally autoload-file)
> - (dolist (fn installed-files)
> - (should (file-exists-p (expand-file-name fn pkg-dir))))
> (dolist (re autoload-forms)
> (goto-char (point-min))
> (should (re-search-forward re nil t)))))))
Overall the changes look good. I think the main thing to improve is
to revise the commit messages to be less descriptive and more
explanatory, but other than that and the few minor points I made here or
there, we are good to go.
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.Received: (at 79411) by debbugs.gnu.org; 8 Nov 2025 20:39:50 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Nov 08 15:39:50 2025 Received: from localhost ([127.0.0.1]:53719 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1vHpis-0002ej-1I for submit <at> debbugs.gnu.org; Sat, 08 Nov 2025 15:39:49 -0500 Received: from mr4.vodafonemail.de ([145.253.228.164]:59318) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <jschmidt4gnu@HIDDEN>) id 1vHpim-0002eV-1P for 79411 <at> debbugs.gnu.org; Sat, 08 Nov 2025 15:39:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vodafonemail.de; s=vfde-mb-mr2-23sep; t=1762634373; bh=tRo3CaMqcDzQeERHtolEFyrRlQdNUoQUKliIAVSpWLs=; h=Content-Type:Message-ID:Date:User-Agent:Subject:To:References: From:Content-Language:In-Reply-To:From; b=K832WtRt56+NXKVX9w6QI5HeMewlxOZJJ42/wHQoyTII8rZ1lqwv+w5wNNwJnJMQI UrjMqfxd6eWrpjEQ/HD5PGadQiEg9zobBLlj8bq5axAC1v4Ge7SW17er1ElA0DmQY/ MBrXGMntmOzrH56d2QBrijA58x6R2U4+OqiNfZss= Received: from smtp.vodafone.de (unknown [10.0.0.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by mr4.vodafonemail.de (Postfix) with ESMTPS id 4d3nps3SRXz1xxj; Sat, 8 Nov 2025 20:39:33 +0000 (UTC) Received: from [192.168.178.41] (port-92-196-194-141.dynamic.as20676.net [92.196.194.141]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.vodafone.de (Postfix) with ESMTPSA id 4d3npn1W3dz8sWw; Sat, 8 Nov 2025 20:39:26 +0000 (UTC) Content-Type: multipart/mixed; boundary="------------Uq5p2kF2lOreSiRLvHmLTb0i" Message-ID: <84a9b4d9-d9a7-4644-b3a9-b95b3e6ae92d@HIDDEN> Date: Sat, 8 Nov 2025 21:39:21 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#79411: 31.0.50; describe-package does not show :readme after package installation, but sth else To: Philip Kaludercic <philipk@HIDDEN> References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN> <8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN> <796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN> <871pocr7ot.fsf@HIDDEN> <86wm648utt.fsf@HIDDEN> <87wm64owhk.fsf@HIDDEN> <8d75da04-15d7-4c40-bb09-912b02aee492@HIDDEN> <877by2y6u0.fsf@HIDDEN> <37f04165-802f-4bd8-9762-8e79ec55dd08@HIDDEN> <87tszuyc7y.fsf@HIDDEN> <8066c764-ea05-40f1-9d99-d8cf129dbdb4@HIDDEN> <87tszlstnt.fsf@HIDDEN> From: Jens Schmidt <jschmidt4gnu@HIDDEN> Content-Language: de-DE-frami, en-US In-Reply-To: <87tszlstnt.fsf@HIDDEN> X-purgate-type: clean X-purgate: clean X-purgate-size: 32932 X-purgate-ID: 155817::1762634372-9C9183B6-F76B616A/0/0 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 79411 Cc: 79411 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) This is a multi-part message in MIME format. --------------Uq5p2kF2lOreSiRLvHmLTb0i Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Philip Kaludercic <philipk@HIDDEN> writes: > Oh, don't remind me that other people are reading along ^^ Until recently I considered that discussion to be one of the more fruitful ones on emacs-devel, really. Now I'm loosing track of the various proposals ... >> Here is what I would do, one commit per list item, with references >> to my replies below. >> >> 1. The changes related to my bug [1]. >> >> 2. My changes to function `with-package-test' plus your comment >> on `(cd ,basedir)' [2]. >> >> 3. The typo I spotted and other minor unrelated changes [3]. >> >> 4. (Optionally) breaking up long lines not originating from my >> code. > > Having this is a separate commit is probably not necessary, but it > really depends on how much you end up re-structuring the code. There is > a point at which Git's line-oriented version history becomes inadequate > and we have to accept that fact. I implemented (almost) all changes as discussed on a recent master in three commits and tested them. I did not yet wrap any long lines not related to my changes. If the following pattern for wrapping such lines looks OK to you, I can do the remaining lines as well, in yet another commit. +(ert-deftest package-test-describe-installed-with-ws-only-readme () + "Test displaying of the readme for installed package with ws-only readme." [...] + (should + (search-forward "Package simple-single is installed." nil t)) + (save-excursion + (should + (search-forward "This package provides a minor mode to frobnicate" + nil t))) + (save-excursion + (should-not + (search-forward "This is a server readme file." nil t))))))) > If it makes sense to change it along with the commit, that is fine. > BTW, I can also make adjustment to your patches just before pushing them > as long as you are fine with them, so we don't have to perfect and > pre-discuss everything. Sure. >> Right, but that's a typo, anyway, and one that renders the >> test useless. So stuff it into [3]? > > Oh, my bad, I misunderstood that this affects the test. Then you should > certainly fix it. Depending on what the other changes are in [3], it > might also be "critical" enough to have in a separate commit. Made it a separate commit. Please let me know how to continue here. Thanks! --------------Uq5p2kF2lOreSiRLvHmLTb0i Content-Type: text/x-patch; charset=UTF-8; name="0001-Use-a-consistent-package-description.patch" Content-Disposition: attachment; filename="0001-Use-a-consistent-package-description.patch" Content-Transfer-Encoding: base64 RnJvbSAyMzE4OWMwMWYyMmFjYTE1OTRhZjkyYzQxYzIxZmRjY2Q2YTU2Y2EyIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKZW5zIFNjaG1pZHQgPGZhcmJsb3NAdm9kYWZvbmVt YWlsLmRlPgpEYXRlOiBGcmksIDMxIE9jdCAyMDI1IDIwOjQxOjUwICswMTAwClN1YmplY3Q6 IFtQQVRDSCAxLzNdIFVzZSBhIGNvbnNpc3RlbnQgcGFja2FnZSBkZXNjcmlwdGlvbgoKRnJv bTogSmVucyBTY2htaWR0IDxqc2NobWlkdDRnbnVAdm9kYWZvbmVtYWlsLmRlPgoKRW5zdXJl IHRoYXQgdGhlIGxvbmcgZGVzY3JpcHRpb24gb2YgYSBwYWNrYWdlIGlzIHRoZSBzYW1lIHJl Z2FyZGxlc3Mgb2YKb3JpZ2luYXRpbmcgcGFja2FnZSBhcmNoaXZlIGFuZCBwYWNrYWdlIGlu c3RhbGxhdGlvbiBzdGF0ZS4KCiogbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UuZWw6IEFkZCBk b2N1bWVudGF0aW9uIG9uIGFkZGl0aW9uYWwgZmlsZXMgdGhhdApFbWFjcyBjcmVhdGVzIGR1 cmluZyBwYWNrYWdlIGluc3RhbGxhdGlvbi4KKHBhY2thZ2UtZGVzYyk6IFVwZGF0ZSBkZXNj cmlwdGlvbiBvZiBzbG90IGBraW5kJy4KKHBhY2thZ2UtaW5zdGFsbC1mcm9tLWFyY2hpdmUp OiBEb3dubG9hZCAnKi1yZWFkbWUudHh0JyBmcm9tIHRoZSBhcmNoaXZlCmFuZCBzYXZlIGl0 IGFzICdSRUFETUUtZWxwYScuCiogdGVzdC9saXNwL2VtYWNzLWxpc3AvcGFja2FnZS1yZXNv dXJjZXMvbXVsdGktZmlsZS1yZWFkbWUudHh0OgoqIHRlc3QvbGlzcC9lbWFjcy1saXNwL3Bh Y2thZ2UtcmVzb3VyY2VzL3NpbXBsZS1zaW5nbGUtcmVhZG1lLnR4dDoKVXBkYXRlIHJlYWRt ZXMgdG8gbWFyayB0aGVtIGFzICJzZXJ2ZXIgcmVhZG1lcyIgYW5kIGRpc3Rpbmd1aXNoIHRo ZW0KZnJvbSB3aGF0IHRoZSBwYWNrYWdlcyB0aGVtc2VsdmVzIHByb3ZpZGUgaW4gdGhlaXIg ZG9jdW1lbnRhdGlvbi4KKiB0ZXN0L2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLXRlc3RzLmVs IChwYWNrYWdlLXRlc3QtaW5zdGFsbC1zaW5nbGVmaWxlKQoocGFja2FnZS10ZXN0LWRlc2Ny aWJlLWluc3RhbGxlZC13aXRoLXdzLW9ubHktcmVhZG1lKTogQWRkIHRlc3RzLgoocGFja2Fn ZS10ZXN0LWluc3RhbGwtbXVsdGlmaWxlKTogVGVzdCBtb3JlIGZpbGVzIGZvciBwcmVzZW5j ZS4KKHBhY2thZ2UtdGVzdC1kZXNjcmliZS1wYWNrYWdlKQoocGFja2FnZS10ZXN0LWRlc2Ny aWJlLWluc3RhbGxlZC1tdWx0aS1maWxlLXBhY2thZ2UpCihwYWNrYWdlLXRlc3QtZGVzY3Jp YmUtbm9uLWluc3RhbGxlZC1wYWNrYWdlKQoocGFja2FnZS10ZXN0LWRlc2NyaWJlLW5vbi1p bnN0YWxsZWQtbXVsdGktZmlsZS1wYWNrYWdlKTogVGVzdCBmb3IKc2VydmVyIHJlYWRtZSBi ZWluZyB1c2VkIGFzIGxvbmcgZGVzY3JpcHRpb24uIChCdWcjNzk0MTEpCi0tLQogbGlzcC9l bWFjcy1saXNwL3BhY2thZ2UuZWwgICAgICAgICAgICAgICAgICAgIHwgMzMgKysrKysrKy0K IC4uLi9wYWNrYWdlLXJlc291cmNlcy9tdWx0aS1maWxlLXJlYWRtZS50eHQgICB8ICAyICst CiAuLi4vc2ltcGxlLXNpbmdsZS1yZWFkbWUudHh0ICAgICAgICAgICAgICAgICAgfCAgMSAr CiB0ZXN0L2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLXRlc3RzLmVsICAgICAgICAgfCA4MiAr KysrKysrKysrKysrKysrKystCiA0IGZpbGVzIGNoYW5nZWQsIDExMSBpbnNlcnRpb25zKCsp LCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdl LmVsIGIvbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UuZWwKaW5kZXggNjMxMjQ3MDZlMjguLjVi OTczNmNhNWNmIDEwMDY0NAotLS0gYS9saXNwL2VtYWNzLWxpc3AvcGFja2FnZS5lbAorKysg Yi9saXNwL2VtYWNzLWxpc3AvcGFja2FnZS5lbApAQCAtNTE2LDcgKzUxNiw5IEBAIHBhY2th Z2UtdmMtcAogICAgICAgICByZXF1aXJlZCB2ZXJzaW9uLgogCiBga2luZCcJVGhlIGRpc3Ry aWJ1dGlvbiBmb3JtYXQgb2YgdGhlIHBhY2thZ2UuICBDdXJyZW50bHksIGl0IGlzCi0gICAg ICAgIGVpdGhlciBgc2luZ2xlJyBvciBgdGFyJy4KKyAgICAgICAgZWl0aGVyIGBzaW5nbGUn LCBgdGFyJywgb3IgKHRlbXBvcmFyaWx5IG9ubHkpIGBkaXInLiAgSW4KKyAgICAgICAgYWRk aXRpb24sIHRoZXJlIGlzIGRpc3RyaWJ1dGlvbiBmb3JtYXQgYHZjJywgd2hpY2ggaXMgaGFu ZGxlZAorICAgICAgICBieSBwYWNrYWdlLXZjLmVsLgogCiBgYXJjaGl2ZScgVGhlIG5hbWUg b2YgdGhlIGFyY2hpdmUgKGFzIGEgc3RyaW5nKSB3aGVuY2UgdGhpcwogICAgICAgICBwYWNr YWdlIGNhbWUuCkBAIC0yMTEzLDYgKzIxMTUsMTggQEAgcGFja2FnZS0tc29ydC1ieS1kZXBl bmRlbmNlCiA7OyBpbnN0YWxsZWQgaW4gYSB2YXJpZXR5IG9mIHdheXMgKGFyY2hpdmVzLCBi dWZmZXIsIGZpbGUpLCBidXQKIDs7IHJlcXVpcmVtZW50cyAoZGVwZW5kZW5jaWVzKSBhcmUg YWx3YXlzIHNhdGlzZmllZCBieSBsb29raW5nIGluCiA7OyBgcGFja2FnZS1hcmNoaXZlLWNv bnRlbnRzJy4KKzs7Cis7OyBJZiBFbWFjcyBpbnN0YWxscyBhIHBhY2thZ2UgZnJvbSBhIHBh Y2thZ2UgYXJjaGl2ZSwgaXQgbWlnaHQgY3JlYXRlCis7OyBzb21lIGZpbGVzIGluIGFkZGl0 aW9uIHRvIHRoZSBwYWNrYWdlJ3MgY29udGVudHMuICBGb3IgZXhhbXBsZToKKzs7Cis7OyAt IElmIHRoZSBwYWNrYWdlIGFyY2hpdmUgcHJvdmlkZXMgYSBub24tdHJpdmlhbCBsb25nIGRl c2NyaXB0aW9uIGZvcgorOzsgICBzb21lIHBhY2thZ2UgaW4gIlBBQ0tBR0UtcmVhZG1lLnR4 dCIsIEVtYWNzIHN0b3JlcyBpdCBpbiBhIGZpbGUKKzs7ICAgbmFtZWQgIlJFQURNRS1lbHBh IiBpbiB0aGUgcGFja2FnZSdzIGNvbnRlbnQgZGlyZWN0b3J5LCB1bmxlc3MgdGhlCis7OyAg IHBhY2thZ2UgaXRzZWxmIHByb3ZpZGVzIHN1Y2ggYSBmaWxlLgorOzsKKzs7IC0gSWYgYSBw YWNrYWdlIGFyY2hpdmUgcHJvdmlkZXMgcGFja2FnZSBzaWduYXR1cmVzLCBFbWFjcyBzdG9y ZXMKKzs7ICAgaW5mb3JtYXRpb24gb24gdGhlIHNpZ25hdHVyZXMgaW4gZmlsZXMgbmFtZWQg Ik5BTUUtVkVSU0lPTi5zaWduZWQiCis7OyAgIGJlbG93IGRpcmVjdG9yeSBgcGFja2FnZS11 c2VyLWRpcicuCiAKIChkZWZ1biBwYWNrYWdlLWFyY2hpdmUtYmFzZSAoZGVzYykKICAgIlJl dHVybiB0aGUgcGFja2FnZSBkZXNjcmliZWQgYnkgREVTQy4iCkBAIC0yMTYyLDcgKzIxNzYs MjIgQEAgcGFja2FnZS1pbnN0YWxsLWZyb20tYXJjaGl2ZQogICAgICAgICAgICAgICAgOzsg VXBkYXRlIHRoZSBuZXcgKGFjdGl2YXRlZCkgcGtnLWRlc2MgYXMgd2VsbC4KICAgICAgICAg ICAgICAgICh3aGVuLWxldCogKChwa2ctZGVzY3MgKGNkciAoYXNzcSAocGFja2FnZS1kZXNj LW5hbWUgcGtnLWRlc2MpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcGFja2FnZS1hbGlzdCkpKSkKLSAgICAgICAgICAgICAgICAgKHNldGYg KHBhY2thZ2UtZGVzYy1zaWduZWQgKGNhciBwa2ctZGVzY3MpKSB0KSkpKSkpKSkpKQorICAg ICAgICAgICAgICAgICAoc2V0ZiAocGFja2FnZS1kZXNjLXNpZ25lZCAoY2FyIHBrZy1kZXNj cykpIHQpKSkpKSkpKQorICAgIDs7IGZldGNoIGEgYmFja3VwIG9mIHRoZSByZWFkbWUgZmls ZSBmcm9tIHRoZSBzZXJ2ZXIuICBTbG90IGBkaXInIGlzCisgICAgOzsgbm90IHlldCBhdmFp bGFibGUgaW4gUEtHLURFU0MsIHNvIGNvYmJsZSB0aGF0IHVwLgorICAgIChsZXQqICgoZGly bmFtZSAocGFja2FnZS1kZXNjLWZ1bGwtbmFtZSBwa2ctZGVzYykpCisgICAgICAgICAgIChw a2ctZGlyIChleHBhbmQtZmlsZS1uYW1lIGRpcm5hbWUgcGFja2FnZS11c2VyLWRpcikpCisg ICAgICAgICAgIChyZWFkbWUgKGV4cGFuZC1maWxlLW5hbWUgIlJFQURNRS1lbHBhIiBwa2ct ZGlyKSkpCisgICAgICAodW5sZXNzIChmaWxlLXJlYWRhYmxlLXAgcmVhZG1lKQorICAgICAg ICAocGFja2FnZS0td2l0aC1yZXNwb25zZS1idWZmZXIgKHBhY2thZ2UtYXJjaGl2ZS1iYXNl IHBrZy1kZXNjKQorICAgICAgICAgIDpmaWxlIChmb3JtYXQgIiVzLXJlYWRtZS50eHQiIChw YWNrYWdlLWRlc2MtbmFtZSBwa2ctZGVzYykpCisgICAgICAgICAgOm5vZXJyb3IgdAorICAg ICAgICAgIDs7IGRvIG5vdCB3cml0ZSBlbXB0eSBvciB3aGl0ZXNwYWNlLW9ubHkgcmVhZG1l cyB0byBnaXZlCisgICAgICAgICAgOzsgYHBhY2thZ2UtLWdldC1kZXNjcmlwdGlvbicgYSBj aGFuY2UgdG8gZmluZCBhbm90aGVyIHJlYWRtZQorICAgICAgICAgICh1bmxlc3MgKHNhdmUt ZXhjdXJzaW9uCisgICAgICAgICAgICAgICAgICAgIChnb3RvLWNoYXIgKHBvaW50LW1pbikp CisgICAgICAgICAgICAgICAgICAgIChsb29raW5nLWF0LXAgIltbOnNwYWNlOl1dKlxcJyIp KQorICAgICAgICAgICAgKHdyaXRlLXJlZ2lvbiBuaWwgbmlsIHJlYWRtZSkpKSkpKSkKIAog Ozs7IyMjYXV0b2xvYWQKIChkZWZ1biBwYWNrYWdlLWluc3RhbGxlZC1wIChwYWNrYWdlICZv cHRpb25hbCBtaW4tdmVyc2lvbikKZGlmZiAtLWdpdCBhL3Rlc3QvbGlzcC9lbWFjcy1saXNw L3BhY2thZ2UtcmVzb3VyY2VzL211bHRpLWZpbGUtcmVhZG1lLnR4dCBiL3Rlc3QvbGlzcC9l bWFjcy1saXNwL3BhY2thZ2UtcmVzb3VyY2VzL211bHRpLWZpbGUtcmVhZG1lLnR4dAppbmRl eCBhZmZkMmU5NmZiMC4uZDM1NDcxZWFmOTcgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9lbWFj cy1saXNwL3BhY2thZ2UtcmVzb3VyY2VzL211bHRpLWZpbGUtcmVhZG1lLnR4dAorKysgYi90 ZXN0L2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLXJlc291cmNlcy9tdWx0aS1maWxlLXJlYWRt ZS50eHQKQEAgLTEgKzEgQEAKLVRoaXMgaXMgYSBiYXJlLWJvbmVzIHJlYWRtZSBmaWxlIGZv ciB0aGUgbXVsdGktZmlsZSBwYWNrYWdlLgorVGhpcyBpcyBhIGJhcmUtYm9uZXMgc2VydmVy IHJlYWRtZSBmaWxlIGZvciB0aGUgbXVsdGktZmlsZSBwYWNrYWdlLgpkaWZmIC0tZ2l0IGEv dGVzdC9saXNwL2VtYWNzLWxpc3AvcGFja2FnZS1yZXNvdXJjZXMvc2ltcGxlLXNpbmdsZS1y ZWFkbWUudHh0IGIvdGVzdC9saXNwL2VtYWNzLWxpc3AvcGFja2FnZS1yZXNvdXJjZXMvc2lt cGxlLXNpbmdsZS1yZWFkbWUudHh0CmluZGV4IDI1ZDMwMzQwMzJiLi5mYTA2NjI5MzdmNyAx MDA2NDQKLS0tIGEvdGVzdC9saXNwL2VtYWNzLWxpc3AvcGFja2FnZS1yZXNvdXJjZXMvc2lt cGxlLXNpbmdsZS1yZWFkbWUudHh0CisrKyBiL3Rlc3QvbGlzcC9lbWFjcy1saXNwL3BhY2th Z2UtcmVzb3VyY2VzL3NpbXBsZS1zaW5nbGUtcmVhZG1lLnR4dApAQCAtMSwzICsxLDQgQEAK IFRoaXMgcGFja2FnZSBwcm92aWRlcyBhIG1pbm9yIG1vZGUgdG8gZnJvYm5pY2F0ZSBhbmQv b3IgYmlmdXJjYXRlCiBhbnkgZmxhbmdlcyB5b3UgZGVzaXJlLiBUbyBhY3RpdmF0ZSBpdCwg dHlwZSAiQy1NLXIgTS0zIGJ1dHRlcmZseSIKIGFuZCBhbGwgeW91ciBkcmVhbXMgd2lsbCBj b21lIHRydWUuCitUaGlzIGlzIGEgc2VydmVyIHJlYWRtZSBmaWxlLgpkaWZmIC0tZ2l0IGEv dGVzdC9saXNwL2VtYWNzLWxpc3AvcGFja2FnZS10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9lbWFj cy1saXNwL3BhY2thZ2UtdGVzdHMuZWwKaW5kZXggZjIyMDUxNzc0YzguLjY1ZTlhM2E1MTkx IDEwMDY0NAotLS0gYS90ZXN0L2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLXRlc3RzLmVsCisr KyBiL3Rlc3QvbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UtdGVzdHMuZWwKQEAgLTQ2Niw2ICs0 NjYsMzMgQEAgcGFja2FnZS10ZXN0LWluc3RhbGwtcHJpb3JpdGl6ZWQKICAgICAgICAgKHNo b3VsZCAodmVyc2lvbi1saXN0LT0gJygxIDMpCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIChwYWNrYWdlLWRlc2MtdmVyc2lvbiBpbnN0YWxsZWQpKSkpKSkpCiAKKyhlcnQt ZGVmdGVzdCBwYWNrYWdlLXRlc3QtaW5zdGFsbC1zaW5nbGVmaWxlICgpCisgICJDaGVjayBw cm9wZXJ0aWVzIG9mIHRoZSBpbnN0YWxsZWQgc2luZ2xlLWZpbGUgcGFja2FnZS4iCisgICh3 aXRoLXBhY2thZ2UtdGVzdCAoOmluc3RhbGwgJyhzaW1wbGUtc2luZ2xlKSkKKyAgICAobGV0 ICgoYXV0b2xvYWQtZmlsZQorICAgICAgICAgICAoZXhwYW5kLWZpbGUtbmFtZSAic2ltcGxl LXNpbmdsZS1hdXRvbG9hZHMuZWwiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChl eHBhbmQtZmlsZS1uYW1lCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAic2ltcGxl LXNpbmdsZS0xLjMiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYWNrYWdlLXRl c3QtdXNlci1kaXIpKSkKKyAgICAgICAgICAoaW5zdGFsbGVkLWZpbGVzICcoIlJFQURNRS1l bHBhIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAic2ltcGxlLXNpbmdsZS1hdXRv bG9hZHMuZWwiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJzaW1wbGUtc2luZ2xl LXBrZy5lbCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInNpbXBsZS1zaW5nbGUu ZWxjIikpCisgICAgICAgICAgKGF1dG9sb2FkLWZvcm1zICcoIl4oYXV0b2xvYWQgJ3NpbXBs ZS1zaW5nbGUtbW9kZSIpKQorICAgICAgICAgIChwa2ctZGlyIChmaWxlLW5hbWUtYXMtZGly ZWN0b3J5CisgICAgICAgICAgICAgICAgICAgIChleHBhbmQtZmlsZS1uYW1lCisgICAgICAg ICAgICAgICAgICAgICAic2ltcGxlLXNpbmdsZS0xLjMiCisgICAgICAgICAgICAgICAgICAg ICBwYWNrYWdlLXRlc3QtdXNlci1kaXIpKSkpCisgICAgICAocGFja2FnZS1yZWZyZXNoLWNv bnRlbnRzKQorICAgICAgKHNob3VsZCAocGFja2FnZS1pbnN0YWxsZWQtcCAnc2ltcGxlLXNp bmdsZSkpCisgICAgICAoZG9saXN0IChmbiBpbnN0YWxsZWQtZmlsZXMpCisgICAgICAgIChz aG91bGQgKGZpbGUtZXhpc3RzLXAgKGV4cGFuZC1maWxlLW5hbWUgZm4gcGtnLWRpcikpKSkK KyAgICAgICh3aXRoLXRlbXAtYnVmZmVyCisgICAgICAgIChpbnNlcnQtZmlsZS1jb250ZW50 cy1saXRlcmFsbHkgYXV0b2xvYWQtZmlsZSkKKyAgICAgICAgKGRvbGlzdCAocmUgYXV0b2xv YWQtZm9ybXMpCisgICAgICAgICAgKGdvdG8tY2hhciAocG9pbnQtbWluKSkKKyAgICAgICAg ICAoc2hvdWxkIChyZS1zZWFyY2gtZm9yd2FyZCByZSBuaWwgdCkpKSkpKSkKKwogKGVydC1k ZWZ0ZXN0IHBhY2thZ2UtdGVzdC1pbnN0YWxsLW11bHRpZmlsZSAoKQogICAiQ2hlY2sgcHJv cGVydGllcyBvZiB0aGUgaW5zdGFsbGVkIG11bHRpLWZpbGUgcGFja2FnZS4iCiAgICh3aXRo LXBhY2thZ2UtdGVzdCAoOmJhc2VkaXIgKGVydC1yZXNvdXJjZS1kaXJlY3RvcnkpIDppbnN0 YWxsICcobXVsdGktZmlsZSkpCkBAIC00NzQsOCArNTAxLDEzIEBAIHBhY2thZ2UtdGVzdC1p bnN0YWxsLW11bHRpZmlsZQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZXhwYW5k LWZpbGUtbmFtZQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIm11bHRpLWZpbGUt MC4yLjMiCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYWNrYWdlLXRlc3QtdXNl ci1kaXIpKSkKLSAgICAgICAgICAoaW5zdGFsbGVkLWZpbGVzICcoImRpciIgIm11bHRpLWZp bGUuaW5mbyIgIm11bHRpLWZpbGUtc3ViLmVsYyIKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIm11bHRpLWZpbGUtYXV0b2xvYWRzLmVsIiAibXVsdGktZmlsZS5lbGMiKSkKKyAg ICAgICAgICAoaW5zdGFsbGVkLWZpbGVzICcoOzsgYWxyZWFkeSBwcmVzZW50IGluIHRhcgor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiUkVBRE1FIiAiZGlyIiAibXVsdGktZmls ZS5pbmZvIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBnZW5lcmF0ZWQgZHVy aW5nIGluc3RhbGxhdGlvbgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiUkVBRE1F LWVscGEiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJtdWx0aS1maWxlLWF1dG9s b2Fkcy5lbCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIm11bHRpLWZpbGUtc3Vi LmVsYyIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIm11bHRpLWZpbGUuZWxjIikp CiAgICAgICAgICAgKGF1dG9sb2FkLWZvcm1zICcoIl4oZGVmdmFyIG11bHRpLWZpbGUtY3Vz dG9tLXZhciIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiXihjdXN0b20tYXV0b2xv YWQgJ211bHRpLWZpbGUtY3VzdG9tLXZhciIKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiXihhdXRvbG9hZCAnbXVsdGktZmlsZS1tb2RlIikpCkBAIC02OTUsNiArNzI3LDE3IEBA IHBhY2thZ2UtdGVzdC1wYWNrYWdlLWluc3RhbGxlZC1wCiAgICAgKHNob3VsZCAocGFja2Fn ZS1pbnN0YWxsZWQtcCAncHJvamVjdCBuaWwpKQogICAgIChzaG91bGQgKG5vdCAocGFja2Fn ZS1pbnN0YWxsZWQtcCAnaW1hZ2luYXJ5LXBhY2thZ2UgbmlsKSkpKSkKIAorOzsgVGhlIGxv bmcgZGVzY3JpcHRpb24gb2YgaW5zdGFsbGVkIHBhY2thZ2VzIHNob3VsZCBwcmltYXJpbHkg Y29tZSBmcm9tCis7OyB0aGUgcGFja2FnZSBhcmNoaXZlIHRocm91Z2ggZmlsZSAqLXJlYWRt ZS50eHQgc3RvcmVkIGluIFJFQURNRS1lbHBhLAorOzsgYW5kIG5vdCBmcm9tIGFueSBSRUFE TUUgKG9yIGNvbW1lbnRhcnkpIG9mIHRoZSBwYWNrYWdlIGl0c2VsZi4gIFNvCis7OyBiZWxv dyB3ZSBpbnRlbnRpb25hbGx5IHRlc3QgZm9yIHRoZSBjb250ZW50cyBvZiBmaWxlcyAqLXJl YWRtZS50eHQKKzs7ICgiKnNlcnZlciogcmVhZG1lIiksIHdoaWNoIGRpZmZlcnMgZnJvbSB3 aGF0IHRoZSBzaW1wbGUtc2luZ2xlLTEuMy5lbAorOzsgb3IgbXVsdGktZmlsZS0wLjIuMy50 YXIvUkVBRE1FIGNvbnRhaW4uCis7OworOzsgSWYgdGhlIHBhY2thZ2UgYXJjaGl2ZSBwcm92 aWRlcyBhIHdoaXRlc3BhY2Utb25seSBmaWxlICotcmVhZG1lLnR4dCwKKzs7IHRoZW4gdGhh dCBzaG91bGQgKm5vdCogYmUgdXNlZCBhcyBSRUFETUUtZWxwYSwgc28gdGhhdAorOzsgYGRl c2NyaWJlLXBhY2thZ2UnIHRyaWVzIHRvIGNvbWUgdXAgd2l0aCBzb21ldGhpbmcgcmVhc29u YWJsZSBpdHNlbGYuCisKIChlcnQtZGVmdGVzdCBwYWNrYWdlLXRlc3QtZGVzY3JpYmUtcGFj a2FnZSAoKQogICAiVGVzdCBkaXNwbGF5aW5nIGhlbHAgZm9yIGEgcGFja2FnZS4iCiAKQEAg LTcyNSw4ICs3NjgsMzcgQEAgcGFja2FnZS10ZXN0LWRlc2NyaWJlLXBhY2thZ2UKICAgICAg KHNhdmUtZXhjdXJzaW9uIChzaG91bGQgKHJlLXNlYXJjaC1mb3J3YXJkICJLZXl3b3Jkczog XFxbP2Zyb2JuaWNhdGVcXF0/IiBuaWwgdCkpKQogICAgICAoc2F2ZS1leGN1cnNpb24gKHNo b3VsZCAoc2VhcmNoLWZvcndhcmQgIlRoaXMgcGFja2FnZSBwcm92aWRlcyBhIG1pbm9yIG1v ZGUgdG8gZnJvYm5pY2F0ZSIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG5pbCB0KSkpCisgICAgIChzYXZlLWV4Y3Vyc2lvbiAoc2hvdWxkIChzZWFy Y2gtZm9yd2FyZCAiVGhpcyBpcyBhIHNlcnZlciByZWFkbWUgZmlsZS4iCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuaWwgdCkpKQogICAgICApKSkK IAorKGVydC1kZWZ0ZXN0IHBhY2thZ2UtdGVzdC1kZXNjcmliZS1pbnN0YWxsZWQtd2l0aC13 cy1vbmx5LXJlYWRtZSAoKQorICAiVGVzdCBkaXNwbGF5aW5nIG9mIHRoZSByZWFkbWUgZm9y IGluc3RhbGxlZCBwYWNrYWdlIHdpdGggd3Mtb25seSByZWFkbWUuIgorCisgIChlcnQtd2l0 aC10ZW1wLWRpcmVjdG9yeSB0ZW1wLWFyY2hpdmUKKyAgICAoY29weS1maWxlIChlcnQtcmVz b3VyY2UtZmlsZSAiYXJjaGl2ZS1jb250ZW50cyIpIHRlbXAtYXJjaGl2ZSkKKyAgICAoY29w eS1maWxlIChlcnQtcmVzb3VyY2UtZmlsZSAic2ltcGxlLXNpbmdsZS0xLjMuZWwiKSB0ZW1w LWFyY2hpdmUpCisgICAgKHdpdGgtdGVtcC1idWZmZXIKKyAgICAgIChpbnNlcnQgIiBcdFxu XHQgXG4iKQorICAgICAgKHdyaXRlLXJlZ2lvbiBuaWwgbmlsIChleHBhbmQtZmlsZS1uYW1l ICJzaW1wbGUtc2luZ2xlLXJlYWRtZS50eHQiCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdGVtcC1hcmNoaXZlKSkpCisgICAgKHdpdGgtcGFja2Fn ZS10ZXN0ICg6bG9jYXRpb24gdGVtcC1hcmNoaXZlKQorICAgICAgKHBhY2thZ2UtaW5pdGlh bGl6ZSkKKyAgICAgIChwYWNrYWdlLXJlZnJlc2gtY29udGVudHMpCisgICAgICAocGFja2Fn ZS1pbnN0YWxsICdzaW1wbGUtc2luZ2xlKQorICAgICAgKHdpdGgtZmFrZS1oZWxwLWJ1ZmZl cgorICAgICAgIChkZXNjcmliZS1wYWNrYWdlICdzaW1wbGUtc2luZ2xlKQorICAgICAgIChn b3RvLWNoYXIgKHBvaW50LW1pbikpCisgICAgICAgKHNob3VsZAorICAgICAgICAoc2VhcmNo LWZvcndhcmQgIlBhY2thZ2Ugc2ltcGxlLXNpbmdsZSBpcyBpbnN0YWxsZWQuIiBuaWwgdCkp CisgICAgICAgKHNhdmUtZXhjdXJzaW9uCisgICAgICAgICAoc2hvdWxkCisgICAgICAgICAg KHNlYXJjaC1mb3J3YXJkICJUaGlzIHBhY2thZ2UgcHJvdmlkZXMgYSBtaW5vciBtb2RlIHRv IGZyb2JuaWNhdGUiCisgICAgICAgICAgICAgICAgICAgICAgICAgIG5pbCB0KSkpCisgICAg ICAgKHNhdmUtZXhjdXJzaW9uCisgICAgICAgICAoc2hvdWxkLW5vdAorICAgICAgICAgIChz ZWFyY2gtZm9yd2FyZCAiVGhpcyBpcyBhIHNlcnZlciByZWFkbWUgZmlsZS4iIG5pbCB0KSkp KSkpKQorCiAoZXJ0LWRlZnRlc3QgcGFja2FnZS10ZXN0LWRlc2NyaWJlLWluc3RhbGxlZC1t dWx0aS1maWxlLXBhY2thZ2UgKCkKICAgIlRlc3QgZGlzcGxheWluZyBvZiB0aGUgcmVhZG1l IGZvciBpbnN0YWxsZWQgbXVsdGktZmlsZSBwYWNrYWdlLiIKIApAQCAtNzM4LDcgKzgxMCw3 IEBAIHBhY2thZ2UtdGVzdC1kZXNjcmliZS1pbnN0YWxsZWQtbXVsdGktZmlsZS1wYWNrYWdl CiAgICAgIChkZXNjcmliZS1wYWNrYWdlICdtdWx0aS1maWxlKQogICAgICAoZ290by1jaGFy IChwb2ludC1taW4pKQogICAgICAoc2hvdWxkIChzZWFyY2gtZm9yd2FyZCAiV2Vic2l0ZTog aHR0cDovL3B1ZGRsZXMubGkiIG5pbCB0KSkKLSAgICAgKHNob3VsZCAoc2VhcmNoLWZvcndh cmQgIlRoaXMgaXMgYSBiYXJlLWJvbmVzIHJlYWRtZSBmaWxlIGZvciB0aGUgbXVsdGktZmls ZSIKKyAgICAgKHNob3VsZCAoc2VhcmNoLWZvcndhcmQgIlRoaXMgaXMgYSBiYXJlLWJvbmVz IHNlcnZlciByZWFkbWUgZmlsZSBmb3IgdGhlIG11bHRpLWZpbGUiCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG5pbCB0KSkpKSkKIAogKGVydC1kZWZ0ZXN0IHBhY2thZ2UtdGVz dC1kZXNjcmliZS1ub24taW5zdGFsbGVkLXBhY2thZ2UgKCkKQEAgLTc1Miw2ICs4MjQsOCBA QCBwYWNrYWdlLXRlc3QtZGVzY3JpYmUtbm9uLWluc3RhbGxlZC1wYWNrYWdlCiAgICAgIChn b3RvLWNoYXIgKHBvaW50LW1pbikpCiAgICAgIChzaG91bGQgKHNlYXJjaC1mb3J3YXJkICJX ZWJzaXRlOiBodHRwOi8vZG9vZGxlcy5hdSIgbmlsIHQpKQogICAgICAoc2hvdWxkIChzZWFy Y2gtZm9yd2FyZCAiVGhpcyBwYWNrYWdlIHByb3ZpZGVzIGEgbWlub3IgbW9kZSB0byBmcm9i bmljYXRlIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuaWwgdCkpCisgICAgIChz aG91bGQgKHNlYXJjaC1mb3J3YXJkICJUaGlzIGlzIGEgc2VydmVyIHJlYWRtZSBmaWxlLiIK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmlsIHQpKSkpKQogCiAoZXJ0LWRlZnRl c3QgcGFja2FnZS10ZXN0LWRlc2NyaWJlLW5vbi1pbnN0YWxsZWQtbXVsdGktZmlsZS1wYWNr YWdlICgpCkBAIC03NjQsNyArODM4LDcgQEAgcGFja2FnZS10ZXN0LWRlc2NyaWJlLW5vbi1p bnN0YWxsZWQtbXVsdGktZmlsZS1wYWNrYWdlCiAgICAgIChkZXNjcmliZS1wYWNrYWdlICdt dWx0aS1maWxlKQogICAgICAoZ290by1jaGFyIChwb2ludC1taW4pKQogICAgICAoc2hvdWxk IChzZWFyY2gtZm9yd2FyZCAiV2Vic2l0ZTogaHR0cDovL3B1ZGRsZXMubGkiIG5pbCB0KSkK LSAgICAgKHNob3VsZCAoc2VhcmNoLWZvcndhcmQgIlRoaXMgaXMgYSBiYXJlLWJvbmVzIHJl YWRtZSBmaWxlIGZvciB0aGUgbXVsdGktZmlsZSIKKyAgICAgKHNob3VsZCAoc2VhcmNoLWZv cndhcmQgIlRoaXMgaXMgYSBiYXJlLWJvbmVzIHNlcnZlciByZWFkbWUgZmlsZSBmb3IgdGhl IG11bHRpLWZpbGUiCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5pbCB0KSkpKSkK IAogKGRlZnZhciBlcGctY29uZmlnLS1wcm9ncmFtLWFsaXN0KSA7IFNpbGVuY2UgYnl0ZS1j b21waWxlci4KLS0gCjIuMzkuNQoK --------------Uq5p2kF2lOreSiRLvHmLTb0i Content-Type: text/x-patch; charset=UTF-8; name="0002-Fix-a-test-relevant-typo.patch" Content-Disposition: attachment; filename="0002-Fix-a-test-relevant-typo.patch" Content-Transfer-Encoding: base64 RnJvbSAwNjdkMTJmNGU0NDkwNDg0OWQ3ZWMxMGM3ZjY1Zjg2NTRkNGRmMWZlIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKZW5zIFNjaG1pZHQgPGZhcmJsb3NAdm9kYWZvbmVt YWlsLmRlPgpEYXRlOiBGcmksIDMxIE9jdCAyMDI1IDIxOjE0OjI3ICswMTAwClN1YmplY3Q6 IFtQQVRDSCAyLzNdIDsgRml4IGEgdGVzdC1yZWxldmFudCB0eXBvCgpGcm9tOiBKZW5zIFNj aG1pZHQgPGpzY2htaWR0NGdudUB2b2RhZm9uZW1haWwuZGU+CgoqIHRlc3QvbGlzcC9lbWFj cy1saXNwL3BhY2thZ2UtdGVzdHMuZWwgKHBhY2thZ2UtdGVzdC1pbnN0YWxsLWZpbGUpOiBG aXgKYSB0ZXN0LXJlbGV2YW50IHR5cG8uCi0tLQogdGVzdC9saXNwL2VtYWNzLWxpc3AvcGFj a2FnZS10ZXN0cy5lbCB8IDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwg MSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL3Rlc3QvbGlzcC9lbWFjcy1saXNwL3BhY2th Z2UtdGVzdHMuZWwgYi90ZXN0L2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLXRlc3RzLmVsCmlu ZGV4IDY1ZTlhM2E1MTkxLi5iODkzZTZmY2UxYiAxMDA2NDQKLS0tIGEvdGVzdC9saXNwL2Vt YWNzLWxpc3AvcGFja2FnZS10ZXN0cy5lbAorKysgYi90ZXN0L2xpc3AvZW1hY3MtbGlzcC9w YWNrYWdlLXRlc3RzLmVsCkBAIC0yODEsNyArMjgxLDcgQEAgcGFja2FnZS10ZXN0LWluc3Rh bGwtZmlsZQogCiAgICAgKGxldCogKChwa2ctZWwgIm11bHRpLWZpbGUtMC4yLjMudGFyIikK ICAgICAgICAgICAgKHNvdXJjZS1maWxlIChleHBhbmQtZmlsZS1uYW1lIHBrZy1lbCAoZXJ0 LXJlc291cmNlLWRpcmVjdG9yeSkpKSkKLSAgICAgIChzaG91bGQtbm90IChwYWNrYWdlLWlu c3RhbGxlZC1wICdtdWx0aWUtZmlsZSkpCisgICAgICAoc2hvdWxkLW5vdCAocGFja2FnZS1p bnN0YWxsZWQtcCAnbXVsdGktZmlsZSkpCiAgICAgICAocGFja2FnZS1pbnN0YWxsLWZpbGUg c291cmNlLWZpbGUpCiAgICAgICAoc2hvdWxkIChwYWNrYWdlLWluc3RhbGxlZC1wICdtdWx0 aS1maWxlKSkKICAgICAgIChwYWNrYWdlLWRlbGV0ZSAoY2FkciAoYXNzcSAnbXVsdGktZmls ZSBwYWNrYWdlLWFsaXN0KSkpKSkpCi0tIAoyLjM5LjUKCg== --------------Uq5p2kF2lOreSiRLvHmLTb0i Content-Type: text/x-patch; charset=UTF-8; name="0003-Brush-up-macro-with-package-test-and-related-tests.patch" Content-Disposition: attachment; filename*0="0003-Brush-up-macro-with-package-test-and-related-tests.patc"; filename*1="h" Content-Transfer-Encoding: base64 RnJvbSBlMzliMjk0YjA3YzE5Zjg2MGM5MjBmMmRmNGU0YjVhOTRkYTFkN2FmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKZW5zIFNjaG1pZHQgPGZhcmJsb3NAdm9kYWZvbmVt YWlsLmRlPgpEYXRlOiBTYXQsIDggTm92IDIwMjUgMjE6MDE6MjEgKzAxMDAKU3ViamVjdDog W1BBVENIIDMvM10gQnJ1c2ggdXAgbWFjcm8gd2l0aC1wYWNrYWdlLXRlc3QgYW5kIHJlbGF0 ZWQgdGVzdHMKCkZyb206IEplbnMgU2NobWlkdCA8anNjaG1pZHQ0Z251QHZvZGFmb25lbWFp bC5kZT4KCiogdGVzdC9saXNwL2VtYWNzLWxpc3AvcGFja2FnZS10ZXN0cy5lbCAod2l0aC1w YWNrYWdlLXRlc3QpOiBSZW1vdmUKdW51c2VkIGtleXdvcmQgOnVwZGF0ZS1uZXdzIGFuZCBp dHMgaW1wbGVtZW50YXRpb24uICBBZGQgZG9jdW1lbnRhdGlvbgpmb3IgcmVtYWluaW5nIGtl eXdvcmRzLiAgUmVkbyBpbXBsZW1lbnRhdGlvbiBvZiBrZXl3b3JkIDp1cGxvYWQtYmFzZSB0 bwp1c2UgZXF1aXZhbGVudCBtYWNybyBgZXJ0LXdpdGgtdGVtcC1kaXJlY3RvcnknIG1hY3Jv LiAgSW1wbGVtZW50IG90aGVyCm1pbm9yIGltcHJvdmVtZW50cy4KKHBhY2thZ2UtdGVzdC1p bnN0YWxsLWZpbGUsIHBhY2thZ2UtdGVzdC1idWc1ODM2NywgcGFja2FnZS10ZXN0LWJ1ZzY1 NDc1KQoocGFja2FnZS10ZXN0LWluc3RhbGwtZmlsZS1FT0xzLCBwYWNrYWdlLXRlc3QtaW5z dGFsbC1tdWx0aWZpbGUpOiBSZW1vdmUKc3VwZXJmbHVvdXMgOmJhc2VkaXIga2V5d29yZCBm cm9tIGB3aXRoLXBhY2thZ2UtdGVzdCcgY2FsbHMuCihwYWNrYWdlLXRlc3QtaW5zdGFsbC1t dWx0aWZpbGUpOiBNb3ZlIGZpbGUgdGVzdHMgb3V0IG9mCmB3aXRoLXRlbXAtYnVmZmVyJy4K LS0tCiB0ZXN0L2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLXRlc3RzLmVsIHwgOTEgKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDUgaW5zZXJ0aW9ucygr KSwgNDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdGVzdC9saXNwL2VtYWNzLWxpc3Av cGFja2FnZS10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UtdGVzdHMu ZWwKaW5kZXggYjg5M2U2ZmNlMWIuLjI2NjIwMWZmNDU5IDEwMDY0NAotLS0gYS90ZXN0L2xp c3AvZW1hY3MtbGlzcC9wYWNrYWdlLXRlc3RzLmVsCisrKyBiL3Rlc3QvbGlzcC9lbWFjcy1s aXNwL3BhY2thZ2UtdGVzdHMuZWwKQEAgLTExMCwxMCArMTEwLDMwIEBAIHdpdGgtcGFja2Fn ZS10ZXN0CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmFz ZWRpcgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluc3Rh bGwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsb2NhdGlv bgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVwZGF0ZS1u ZXdzCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdXBsb2Fk LWJhc2UpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZyZXN0IGJvZHkpCi0g ICJTZXQgdXAgdGVtcG9yYXJ5IGxvY2F0aW9ucyBhbmQgdmFyaWFibGVzIGZvciB0ZXN0aW5n LiIKKyAgIlNldCB1cCB0ZW1wb3JhcnkgbG9jYXRpb25zIGFuZCB2YXJpYWJsZXMgZm9yIHRl c3RpbmcuCitDcmVhdGUgYSB0ZW1wb3JhcnkgYnVmZmVyIGFuZCBleGVjdXRlIEJPRFkgaW4g aXQuCisKK1RoaXMgbWFjcm8gaW50ZXJwcmV0cyB0aGUgZm9sbG93aW5nIGtleXdvcmRzOgor Cis6YmFzZWRpciBCQVNFRElSIC0gQmluZCBkZWZhdWx0IGRpcmVjdG9yeSB0byBCQVNFRElS IGluIHRoZSB0ZW1wb3JhcnkKKyAgYnVmZmVyIGJlZm9yZSBleGVjdXRpbmcgQk9EWS4KKyAg WW91IHNob3VsZCB1c2Uga2V5d29yZCA6YmFzZWRpciBvbmx5IHdoZW4gQk9EWSBvciBGSUxF IHJlcXVpcmVzIGl0OworICB0aGlzIG1hY3JvIGl0c2VsZiBkb2VzIG5vdCByZXF1aXJlIGl0 cyB1c2FnZS4KKworOmZpbGUgRklMRSAtIEV4ZWN1dGUgYGluc2VydC1maWxlLWNvbnRlbnRz JyBvbiBGSUxFIGluIHRoZSB0ZW1wb3JhcnkgYnVmZmVyCisgIGJlZm9yZSBleGVjdXRpbmcg Qk9EWS4KKworOmluc3RhbGwgUEFDS0FHRVMgLSBFeGVjdXRlIGBwYWNrYWdlLWluc3RhbGwn IG9uIGVhY2ggcGFja2FnZSBpbiBsaXN0CisgIFBBQ0tBR0VTIGJlZm9yZSBleGVjdXRpbmcg Qk9EWS4KKworOmxvY2F0aW9uIEFSQ0hJVkUtRElSIC0gVXNlIGRpcmVjdG9yeSBBUkNISVZF LURJUiBhcyBwYWNrYWdlIGFyY2hpdmUKKyAgZGlyZWN0b3J5IGluc3RlYWQgb2YgYHBhY2th Z2UtdGVzdC11c2VyLWRpcicuCisKKzp1cGxvYWQtYmFzZSBVUERBVEUtQkFTRSAtIElmIFVQ REFURS1CQVNFIGlzIG5vbi1uaWwsIGNyZWF0ZSBhIHRlbXBvcmFyeQorICBkaXJlY3Rvcnks IGJpbmQgYHBhY2thZ2UtYXJjaGl2ZS11cGxvYWQtYmFzZScgdG8gdGhlIGxvY2F0aW9uIG9m IHRoYXQKKyAgd2hpbGUgZXhlY3V0aW5nIEJPRFksIGFuZCBjbGVhbiBpdCB1cCBhZnRlciB0 aGF0LiIKICAgKGRlY2xhcmUgKGluZGVudCAxKSAoZGVidWcgKChbJnJlc3QgZm9ybV0pIGJv ZHkpKSkKICAgYChlcnQtd2l0aC10ZW1wLWRpcmVjdG9yeSBwYWNrYWdlLXRlc3QtdXNlci1k aXIKICAgICAgKGxldCogKChwcm9jZXNzLWVudmlyb25tZW50IChjb25zIChmb3JtYXQgIkhP TUU9JXMiIHBhY2thZ2UtdGVzdC11c2VyLWRpcikKQEAgLTEyNSw0NiArMTQ1LDI1IEBAIHdp dGgtcGFja2FnZS10ZXN0CiAgICAgICAgICAgICBhYmJyZXZpYXRlZC1ob21lLWRpcgogICAg ICAgICAgICAgcGFja2FnZS0taW5pdGlhbGl6ZWQKICAgICAgICAgICAgIHBhY2thZ2UtYWxp c3QKLSAgICAgICAgICAgIHBhY2thZ2Utc2VsZWN0ZWQtcGFja2FnZXMKLSAgICAgICAgICAg ICxAKGlmIHVwZGF0ZS1uZXdzCi0gICAgICAgICAgICAgICAgICAnKHBhY2thZ2UtdXBkYXRl LW5ld3Mtb24tdXBsb2FkIHQpCi0gICAgICAgICAgICAgICAgKGxpc3QgKGdlbnN5bSkpKQot ICAgICAgICAgICAgLEAoaWYgdXBsb2FkLWJhc2UKLSAgICAgICAgICAgICAgICAgICcoKHBh Y2thZ2UtdGVzdC1hcmNoaXZlLXVwbG9hZC1iYXNlIChtYWtlLXRlbXAtZmlsZSAicGtnLWFy Y2hpdmUtYmFzZS0iIHQpKQotICAgICAgICAgICAgICAgICAgICAocGFja2FnZS1hcmNoaXZl LXVwbG9hZC1iYXNlIHBhY2thZ2UtdGVzdC1hcmNoaXZlLXVwbG9hZC1iYXNlKSkKLSAgICAg ICAgICAgICAgICAobGlzdCAoZ2Vuc3ltKSkpKSA7OyBEdW1teSB2YWx1ZSBzbyBgbGV0JyBk b2Vzbid0IHRyeSB0byBiaW5kIG5pbAorICAgICAgICAgICAgcGFja2FnZS1zZWxlY3RlZC1w YWNrYWdlcykKICAgICAgICAobGV0ICgoYnVmIChnZXQtYnVmZmVyICIqUGFja2FnZXMqIikp KQogICAgICAgICAgKHdoZW4gKGJ1ZmZlci1saXZlLXAgYnVmKQogICAgICAgICAgICAoa2ls bC1idWZmZXIgYnVmKSkpCi0gICAgICAgKHVud2luZC1wcm90ZWN0Ci0gICAgICAgICAgIChw cm9nbgotICAgICAgICAgICAgICwoaWYgYmFzZWRpciBgKGNkICxiYXNlZGlyKSkKLSAgICAg ICAgICAgICAodW5sZXNzIChmaWxlLWRpcmVjdG9yeS1wIHBhY2thZ2UtdXNlci1kaXIpCi0g ICAgICAgICAgICAgICAobWtkaXIgcGFja2FnZS11c2VyLWRpcikpCi0gICAgICAgICAgICAg KGNsLWxldGYgKCgoc3ltYm9sLWZ1bmN0aW9uICd5ZXMtb3Itbm8tcCkgKGxhbWJkYSAoJnJl c3QgXykgdCkpCi0gICAgICAgICAgICAgICAgICAgICAgICgoc3ltYm9sLWZ1bmN0aW9uICd5 LW9yLW4tcCkgICAgKGxhbWJkYSAoJnJlc3QgXykgdCkpKQotICAgICAgICAgICAgICAgLEAo d2hlbiBpbnN0YWxsCi0gICAgICAgICAgICAgICAgICAgYCgocGFja2FnZS1pbml0aWFsaXpl KQotICAgICAgICAgICAgICAgICAgICAgKHBhY2thZ2UtcmVmcmVzaC1jb250ZW50cykKLSAg ICAgICAgICAgICAgICAgICAgIChtYXBjICdwYWNrYWdlLWluc3RhbGwgLGluc3RhbGwpKSkK LSAgICAgICAgICAgICAgICh3aXRoLXRlbXAtYnVmZmVyCi0gICAgICAgICAgICAgICAgICwo aWYgZmlsZQotICAgICAgICAgICAgICAgICAgICAgIGAoaW5zZXJ0LWZpbGUtY29udGVudHMg LGZpbGUpKQotICAgICAgICAgICAgICAgICAsQGJvZHkpKSkKLQotICAgICAgICAgKHdoZW4g LHVwbG9hZC1iYXNlCi0gICAgICAgICAgIChkb2xpc3QgKGYgJygiYXJjaGl2ZS1jb250ZW50 cyIKLSAgICAgICAgICAgICAgICAgICAgICAgICJzaW1wbGUtc2luZ2xlLTEuMy5lbCIKLSAg ICAgICAgICAgICAgICAgICAgICAgICJzaW1wbGUtc2luZ2xlLTEuNC5lbCIKLSAgICAgICAg ICAgICAgICAgICAgICAgICJzaW1wbGUtc2luZ2xlLXJlYWRtZS50eHQiKSkKLSAgICAgICAg ICAgICAoaWdub3JlLWVycm9ycwotICAgICAgICAgICAgICAgKGRlbGV0ZS1maWxlCi0gICAg ICAgICAgICAgICAgKGV4cGFuZC1maWxlLW5hbWUgZiBwYWNrYWdlLXRlc3QtYXJjaGl2ZS11 cGxvYWQtYmFzZSkpKSkKLSAgICAgICAgICAgKGRlbGV0ZS1kaXJlY3RvcnkgcGFja2FnZS10 ZXN0LWFyY2hpdmUtdXBsb2FkLWJhc2UpKQotCi0gICAgICAgICAod2hlbiAoYW5kIChib3Vu ZHAgJ3BhY2thZ2UtdGVzdC1hcmNoaXZlLXVwbG9hZC1iYXNlKQotICAgICAgICAgICAgICAg ICAgICAoZmlsZS1kaXJlY3RvcnktcCBwYWNrYWdlLXRlc3QtYXJjaGl2ZS11cGxvYWQtYmFz ZSkpCi0gICAgICAgICAgIChkZWxldGUtZGlyZWN0b3J5IHBhY2thZ2UtdGVzdC1hcmNoaXZl LXVwbG9hZC1iYXNlIHQpKSkpKSkKKyAgICAgICAodW5sZXNzIChmaWxlLWRpcmVjdG9yeS1w IHBhY2thZ2UtdXNlci1kaXIpCisgICAgICAgICAobWtkaXIgcGFja2FnZS11c2VyLWRpcikp CisgICAgICAgKGNsLWxldGYgKCgoc3ltYm9sLWZ1bmN0aW9uICd5LW9yLW4tcCkgKGxhbWJk YSAoJnJlc3QgXykgdCkpKQorICAgICAgICAgLEAod2hlbiBpbnN0YWxsCisgICAgICAgICAg ICAgYCgocGFja2FnZS1pbml0aWFsaXplKQorICAgICAgICAgICAgICAgKHBhY2thZ2UtcmVm cmVzaC1jb250ZW50cykKKyAgICAgICAgICAgICAgIChtYXBjICdwYWNrYWdlLWluc3RhbGwg LGluc3RhbGwpKSkKKyAgICAgICAgICh3aXRoLXRlbXAtYnVmZmVyCisgICAgICAgICAgIChs ZXQgLChpZiBiYXNlZGlyIGAoKGRlZmF1bHQtZGlyZWN0b3J5ICxiYXNlZGlyKSkgJygpKQor ICAgICAgICAgICAgICwoaWYgZmlsZQorICAgICAgICAgICAgICAgICAgYChpbnNlcnQtZmls ZS1jb250ZW50cyAsZmlsZSkpCisgICAgICAgICAgICAgLChpZiB1cGxvYWQtYmFzZQorICAg ICAgICAgICAgICAgICAgYChlcnQtd2l0aC10ZW1wLWRpcmVjdG9yeSBwYWNrYWdlLWFyY2hp dmUtdXBsb2FkLWJhc2UKKyAgICAgICAgICAgICAgICAgICAgICxAYm9keSkKKyAgICAgICAg ICAgICAgICBgKHByb2duICxAYm9keSkpKSkpKSkpCiAKIChkZWZtYWNybyB3aXRoLWZha2Ut aGVscC1idWZmZXIgKCZyZXN0IGJvZHkpCiAgICJFeGVjdXRlIEJPRFkgaW4gYSB0ZW1wIGJ1 ZmZlciB3aGljaCBpcyB0cmVhdGVkIGFzIHRoZSBcIipIZWxwKlwiIGJ1ZmZlci4iCkBAIC0y NjksNyArMjY4LDcgQEAgcGFja2FnZS10ZXN0LWluc3RhbGwtc2luZ2xlCiAKIChlcnQtZGVm dGVzdCBwYWNrYWdlLXRlc3QtaW5zdGFsbC1maWxlICgpCiAgICJJbnN0YWxsIGZpbGVzIHdp dGggYHBhY2thZ2UtaW5zdGFsbC1maWxlJy4iCi0gICh3aXRoLXBhY2thZ2UtdGVzdCAoOmJh c2VkaXIgKGVydC1yZXNvdXJjZS1kaXJlY3RvcnkpKQorICAod2l0aC1wYWNrYWdlLXRlc3Qg KCkKICAgICAocGFja2FnZS1pbml0aWFsaXplKQogICAgIChsZXQqICgocGtnLWVsICJzaW1w bGUtc2luZ2xlLTEuMy5lbCIpCiAgICAgICAgICAgIChzb3VyY2UtZmlsZSAoZXhwYW5kLWZp bGUtbmFtZSBwa2ctZWwgKGVydC1yZXNvdXJjZS1kaXJlY3RvcnkpKSkpCkBAIC0yODgsNyAr Mjg3LDcgQEAgcGFja2FnZS10ZXN0LWluc3RhbGwtZmlsZQogCiAoZXJ0LWRlZnRlc3QgcGFj a2FnZS10ZXN0LWJ1ZzU4MzY3ICgpCiAgICJDaGVjayB2YXJpYXRpb25zIGluIHRhcmJhbGwg Zm9ybWF0cy4iCi0gICh3aXRoLXBhY2thZ2UtdGVzdCAoOmJhc2VkaXIgKGVydC1yZXNvdXJj ZS1kaXJlY3RvcnkpKQorICAod2l0aC1wYWNrYWdlLXRlc3QgKCkKICAgICAocGFja2FnZS1p bml0aWFsaXplKQogCiAgICAgOzsgQSBwYWNrYWdlIHdob3NlIGZpcnN0IGVudHJ5IGlzIHRo ZSBtYWluIGRpciBidXQgd2l0aG91dCB0cmFpbGluZyAvLgpAQCAtMzEwLDcgKzMwOSw3IEBA IHBhY2thZ2UtdGVzdC1idWc1ODM2NwogCiAoZXJ0LWRlZnRlc3QgcGFja2FnZS10ZXN0LWJ1 ZzY1NDc1ICgpCiAgICJEZWxldGluZyB0aGUgbGFzdCBwYWNrYWdlIGNsZWFycyBgcGFja2Fn ZS1zZWxlY3RlZC1wYWNrYWdlcycuIgotICAod2l0aC1wYWNrYWdlLXRlc3QgKDpiYXNlZGly IChlcnQtcmVzb3VyY2UtZGlyZWN0b3J5KSkKKyAgKHdpdGgtcGFja2FnZS10ZXN0ICgpCiAg ICAgKHBhY2thZ2UtaW5pdGlhbGl6ZSkKICAgICAobGV0KiAoKHBrZy1lbCAic2ltcGxlLXNp bmdsZS0xLjMuZWwiKQogICAgICAgICAgICAoc291cmNlLWZpbGUgKGV4cGFuZC1maWxlLW5h bWUgcGtnLWVsIChlcnQtcmVzb3VyY2UtZGlyZWN0b3J5KSkpKQpAQCAtMzI2LDcgKzMyNSw3 IEBAIHBhY2thZ2UtdGVzdC1idWc2NTQ3NQogKGVydC1kZWZ0ZXN0IHBhY2thZ2UtdGVzdC1p bnN0YWxsLWZpbGUtRU9McyAoKQogICAiSW5zdGFsbCBzYW1lIGZpbGUgbXVsdGlwbGUgdGlt ZSB3aXRoIGBwYWNrYWdlLWluc3RhbGwtZmlsZScKIGJ1dCB3aXRoIGEgZGlmZmVyZW50IGVu ZCBvZiBsaW5lIGNvbnZlbnRpb24gKGJ1ZyM0ODEzNykuIgotICAod2l0aC1wYWNrYWdlLXRl c3QgKDpiYXNlZGlyIChlcnQtcmVzb3VyY2UtZGlyZWN0b3J5KSkKKyAgKHdpdGgtcGFja2Fn ZS10ZXN0ICgpCiAgICAgKHBhY2thZ2UtaW5pdGlhbGl6ZSkKICAgICAobGV0KiAoKHBrZy1l bCAic2ltcGxlLXNpbmdsZS0xLjMuZWwiKQogICAgICAgICAgICAoc291cmNlLWZpbGUgKGV4 cGFuZC1maWxlLW5hbWUgcGtnLWVsIChlcnQtcmVzb3VyY2UtZGlyZWN0b3J5KSkpKQpAQCAt NDk1LDcgKzQ5NCw3IEBAIHBhY2thZ2UtdGVzdC1pbnN0YWxsLXNpbmdsZWZpbGUKIAogKGVy dC1kZWZ0ZXN0IHBhY2thZ2UtdGVzdC1pbnN0YWxsLW11bHRpZmlsZSAoKQogICAiQ2hlY2sg cHJvcGVydGllcyBvZiB0aGUgaW5zdGFsbGVkIG11bHRpLWZpbGUgcGFja2FnZS4iCi0gICh3 aXRoLXBhY2thZ2UtdGVzdCAoOmJhc2VkaXIgKGVydC1yZXNvdXJjZS1kaXJlY3RvcnkpIDpp bnN0YWxsICcobXVsdGktZmlsZSkpCisgICh3aXRoLXBhY2thZ2UtdGVzdCAoOmluc3RhbGwg JyhtdWx0aS1maWxlKSkKICAgICAobGV0ICgoYXV0b2xvYWQtZmlsZQogICAgICAgICAgICAo ZXhwYW5kLWZpbGUtbmFtZSAibXVsdGktZmlsZS1hdXRvbG9hZHMuZWwiCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChleHBhbmQtZmlsZS1uYW1lCkBAIC01MTcsMTAgKzUxNiwx MCBAQCBwYWNrYWdlLXRlc3QtaW5zdGFsbC1tdWx0aWZpbGUKICAgICAgICAgICAgICAgICAg ICAgIHBhY2thZ2UtdGVzdC11c2VyLWRpcikpKSkKICAgICAgIChwYWNrYWdlLXJlZnJlc2gt Y29udGVudHMpCiAgICAgICAoc2hvdWxkIChwYWNrYWdlLWluc3RhbGxlZC1wICdtdWx0aS1m aWxlKSkKKyAgICAgIChkb2xpc3QgKGZuIGluc3RhbGxlZC1maWxlcykKKyAgICAgICAgKHNo b3VsZCAoZmlsZS1leGlzdHMtcCAoZXhwYW5kLWZpbGUtbmFtZSBmbiBwa2ctZGlyKSkpKQog ICAgICAgKHdpdGgtdGVtcC1idWZmZXIKICAgICAgICAgKGluc2VydC1maWxlLWNvbnRlbnRz LWxpdGVyYWxseSBhdXRvbG9hZC1maWxlKQotICAgICAgICAoZG9saXN0IChmbiBpbnN0YWxs ZWQtZmlsZXMpCi0gICAgICAgICAgKHNob3VsZCAoZmlsZS1leGlzdHMtcCAoZXhwYW5kLWZp bGUtbmFtZSBmbiBwa2ctZGlyKSkpKQogICAgICAgICAoZG9saXN0IChyZSBhdXRvbG9hZC1m b3JtcykKICAgICAgICAgICAoZ290by1jaGFyIChwb2ludC1taW4pKQogICAgICAgICAgIChz aG91bGQgKHJlLXNlYXJjaC1mb3J3YXJkIHJlIG5pbCB0KSkpKSkpKQotLSAKMi4zOS41Cgo= --------------Uq5p2kF2lOreSiRLvHmLTb0i--
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.
Received: (at 79411) by debbugs.gnu.org; 26 Oct 2025 13:02:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Oct 26 09:02:27 2025
Received: from localhost ([127.0.0.1]:44667 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1vD0OA-000240-Pq
for submit <at> debbugs.gnu.org; Sun, 26 Oct 2025 09:02:27 -0400
Received: from mout01.posteo.de ([185.67.36.65]:43605)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <philipk@HIDDEN>)
id 1vD0O7-00023j-Sg
for 79411 <at> debbugs.gnu.org; Sun, 26 Oct 2025 09:02:25 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 84BCF240027
for <79411 <at> debbugs.gnu.org>; Sun, 26 Oct 2025 14:02:16 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=posteo.net; s=2017;
t=1761483736; bh=CjZKZ9oxtksuV4ZD8DDMgnZ14kbtpuMytYVSYn+vPlg=;
h=From:To:Cc:Subject:OpenPGP:Date:Message-ID:MIME-Version:
Content-Type:From;
b=L2j6+OyMJ8WyKZC/pHY+aIY1hlzuwIxAIiWdjpix6K37K4RoTnow+fdBgkOjFip8E
uaFFccxbu1qtvmNrVS8JhihnURrdTfxffMNfUXW95izv0QzC8YzBgCclb0Am2YeuKa
V85R60FKZJc4jaya1Zmw11d0qkyvxjz3IgjUpt023CdvrLObXkwHw3U6jjcCGxydw7
Cw+UzS17/Ao5hQDP0FfL5JCYcptwZJT2/FOPfmUkeM4utcvMzem9XWaZK/3fow0hLj
dwulLDgy5v2C5rpNmrXm1QG8B+Rqh3vZY+wnxnrXEdtaNLOJXRX26okH1LP30WpmTw
V2hWg5GAn3rjg==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4cvcHC6XBnz6v14;
Sun, 26 Oct 2025 14:02:15 +0100 (CET)
From: Philip Kaludercic <philipk@HIDDEN>
To: Jens Schmidt <jschmidt4gnu@HIDDEN>
Subject: Re: bug#79411: 31.0.50; describe-package does not show :readme
after package installation, but sth else
In-Reply-To: <8066c764-ea05-40f1-9d99-d8cf129dbdb4@HIDDEN>
References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN>
<8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN>
<796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN>
<871pocr7ot.fsf@HIDDEN> <86wm648utt.fsf@HIDDEN>
<87wm64owhk.fsf@HIDDEN>
<8d75da04-15d7-4c40-bb09-912b02aee492@HIDDEN>
<877by2y6u0.fsf@HIDDEN>
<37f04165-802f-4bd8-9762-8e79ec55dd08@HIDDEN>
<87tszuyc7y.fsf@HIDDEN>
<8066c764-ea05-40f1-9d99-d8cf129dbdb4@HIDDEN>
OpenPGP: id=7126E1DE2F0CE35C770BED01F2C3CC513DB89F66;
url="https://keys.openpgp.org/vks/v1/by-fingerprint/7126E1DE2F0CE35C770BED01F2C3CC513DB89F66";
preference=signencrypt
Date: Sun, 26 Oct 2025 13:02:16 +0000
Message-ID: <87tszlstnt.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 79411
Cc: 79411 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
Jens Schmidt <jschmidt4gnu@HIDDEN> writes:
> On 2025-10-19 20:32, Philip Kaludercic wrote:
>
>> Sorry for the delay, I am not that familiar with package-tests.el so I
>> had to plan in more time to take a proper look at the patches.
>
> No problem, thanks for your review. I have been closely following
> the `cond-let*' debate, which has helped shortening the waiting
> time :-).
Oh, don't remind me that other people are reading along ^^
>>From your replies I get the impression that you'd rather have more
>> than one commit than all the changes in one. Is that so?
>
> Here is what I would do, one commit per list item, with references
> to my replies below.
>
> 1. The changes related to my bug [1].
>
> 2. My changes to function `with-package-test' plus your comment
> on `(cd ,basedir)' [2].
>
> 3. The typo I spotted and other minor unrelated changes [3].
>
> 4. (Optionally) breaking up long lines not originating from my
> code.
Having this is a separate commit is probably not necessary, but it
really depends on how much you end up re-structuring the code. There is
a point at which Git's line-oriented version history becomes inadequate
and we have to accept that fact.
> WDYT?
Sounds good.
>>> `kind' The distribution format of the package. Currently, it is
>>> - either `single' or `tar'.
>>> + either `single', `tar', or (temporarily only `dir'). In
>>
>> The parentheses here are confusing, what are they supposed to mean?
>>
>>> + addition, there is distribution format `vc', which is
>>> + handled by package-vc.el.
>
> [1] Would
(took me a while to parse this)
>> - either `single' or `tar'.
>> + either `single', `tar', or (temporarily only) `dir'. In
>
> be clearer? That's what I intended.
Yes, that is much clearer!
>>> (with-temp-buffer
>>> + ,(if basedir `(cd ,basedir))
>>
>> Why do we do this in the first place instead of binding default-directory?
>
> I can change that as well, but that would be more changes that are
> not related to the original bug. Should I, in commit [2]?
If it makes sense to change it along with the commit, that is fine.
BTW, I can also make adjustment to your patches just before pushing them
as long as you are fine with them, so we don't have to perfect and
pre-discuss everything.
>>> @@ -281,14 +301,14 @@ package-test-install-file
>>>
>>> (let* ((pkg-el "multi-file-0.2.3.tar")
>>> (source-file (expand-file-name pkg-el (ert-resource-directory))))
>>> - (should-not (package-installed-p 'multie-file))
>>> + (should-not (package-installed-p 'multi-file))
>>
>> I would refrain from these kinds of little changes, as they make
>> git-blame(1) less informative.
>
> Right, but that's a typo, anyway, and one that renders the
> test useless. So stuff it into [3]?
Oh, my bad, I misunderstood that this affects the test. Then you should
certainly fix it. Depending on what the other changes are in [3], it
might also be "critical" enough to have in a separate commit.
>>> +(ert-deftest package-test-install-singlefile ()
>>> + "Check properties of the installed single-file package."
>>> + (with-package-test (:install '(simple-single))
>>> + (let ((autoload-file
>>> + (expand-file-name "simple-single-autoloads.el"
>>> + (expand-file-name
>>> + "simple-single-1.3"
>>> + package-test-user-dir)))
>>> + (installed-files '("README-elpa"
>>> + "simple-single-autoloads.el"
>>> + "simple-single-pkg.el"
>>> + "simple-single.elc"))
>>> + (autoload-forms '("^(autoload 'simple-single-mode"))
>>> + (pkg-dir (file-name-as-directory
>>> + (expand-file-name
>>> + "simple-single-1.3"
>>> + package-test-user-dir))))
>>> + (package-refresh-contents)
>>> + (should (package-installed-p 'simple-single))
>>> + (with-temp-buffer
>>> + (dolist (fn installed-files)
>>> + (should (file-exists-p (expand-file-name fn pkg-dir))))
>>
>> Shouldn't you move this out of the with-temp-buffer?
>
> Right. I kept it in the `with-temp-buffer' to be consistently
> ugly with the test I copied from, `package-test-install-multifile'.
> Should I fix it here as part of commit [1]?
>
> And in `package-test-install-multifile' in commit [3]?
I leave that up to you.
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.
Received: (at 79411) by debbugs.gnu.org; 19 Oct 2025 19:55:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Oct 19 15:55:27 2025
Received: from localhost ([127.0.0.1]:38744 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1vAZV1-0000gL-4d
for submit <at> debbugs.gnu.org; Sun, 19 Oct 2025 15:55:27 -0400
Received: from mr4.vodafonemail.de ([145.253.228.164]:49838)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <jschmidt4gnu@HIDDEN>)
id 1vAZUy-0000fy-OU
for 79411 <at> debbugs.gnu.org; Sun, 19 Oct 2025 15:55:25 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vodafonemail.de;
s=vfde-mb-mr2-23sep; t=1760903717;
bh=GYcVU1BkyUK4Gc80gXJvZwKul/V+qbMgTmL4O/TPZgY=;
h=Message-ID:Date:User-Agent:Subject:To:References:From:
Content-Language:In-Reply-To:Content-Type:From;
b=cIeZO4eQzlGfFOErnW7pHRsK6f7Tq7czr79kuMYaX/1tStwBk0sGPDvIcil2CrfZm
5H64G2339/rO/eXYgARH09yZGFma6uNHU9Wz3m4lUId1d0JDhupLOrcotgCbv2+24M
KZ+GCnfR6AdkgVEcl4k1EUNxM0aPV7uc2KSgowNw=
Received: from smtp.vodafone.de (unknown [10.0.0.2])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by mr4.vodafonemail.de (Postfix) with ESMTPS id 4cqTn12T09z1xxR;
Sun, 19 Oct 2025 19:55:17 +0000 (UTC)
Received: from [192.168.178.41] (port-92-199-208-162.dynamic.as20676.net
[92.199.208.162])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by smtp.vodafone.de (Postfix) with ESMTPSA id 4cqTms6Sknz90qy;
Sun, 19 Oct 2025 19:55:06 +0000 (UTC)
Message-ID: <8066c764-ea05-40f1-9d99-d8cf129dbdb4@HIDDEN>
Date: Sun, 19 Oct 2025 21:55:02 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: bug#79411: 31.0.50; describe-package does not show :readme after
package installation, but sth else
To: Philip Kaludercic <philipk@HIDDEN>
References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN>
<8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN>
<796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN>
<871pocr7ot.fsf@HIDDEN> <86wm648utt.fsf@HIDDEN>
<87wm64owhk.fsf@HIDDEN>
<8d75da04-15d7-4c40-bb09-912b02aee492@HIDDEN>
<877by2y6u0.fsf@HIDDEN>
<37f04165-802f-4bd8-9762-8e79ec55dd08@HIDDEN>
<87tszuyc7y.fsf@HIDDEN>
From: Jens Schmidt <jschmidt4gnu@HIDDEN>
Content-Language: de-DE-frami, en-US
In-Reply-To: <87tszuyc7y.fsf@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-purgate-type: clean
X-purgate: clean
X-purgate-size: 3635
X-purgate-ID: 155817::1760903713-62EE3C36-50F62E67/0/0
X-Spam-Score: -1.7 (-)
X-Debbugs-Envelope-To: 79411
Cc: 79411 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.7 (--)
On 2025-10-19 20:32, Philip Kaludercic wrote:
> Sorry for the delay, I am not that familiar with package-tests.el so I
> had to plan in more time to take a proper look at the patches.
No problem, thanks for your review. I have been closely following
the `cond-let*' debate, which has helped shortening the waiting
time :-).
From your replies I get the impression that you'd rather have more
than one commit than all the changes in one. Is that so?
Here is what I would do, one commit per list item, with references
to my replies below.
1. The changes related to my bug [1].
2. My changes to function `with-package-test' plus your comment
on `(cd ,basedir)' [2].
3. The typo I spotted and other minor unrelated changes [3].
4. (Optionally) breaking up long lines not originating from my
code.
WDYT?
>> `kind' The distribution format of the package. Currently, it is
>> - either `single' or `tar'.
>> + either `single', `tar', or (temporarily only `dir'). In
>
> The parentheses here are confusing, what are they supposed to mean?
>
>> + addition, there is distribution format `vc', which is
>> + handled by package-vc.el.
[1] Would
> - either `single' or `tar'.
> + either `single', `tar', or (temporarily only) `dir'. In
be clearer? That's what I intended.
>> (with-temp-buffer
>> + ,(if basedir `(cd ,basedir))
>
> Why do we do this in the first place instead of binding default-directory?
I can change that as well, but that would be more changes that are
not related to the original bug. Should I, in commit [2]?
>> @@ -281,14 +301,14 @@ package-test-install-file
>>
>> (let* ((pkg-el "multi-file-0.2.3.tar")
>> (source-file (expand-file-name pkg-el (ert-resource-directory))))
>> - (should-not (package-installed-p 'multie-file))
>> + (should-not (package-installed-p 'multi-file))
>
> I would refrain from these kinds of little changes, as they make
> git-blame(1) less informative.
Right, but that's a typo, anyway, and one that renders the
test useless. So stuff it into [3]?
>> +(ert-deftest package-test-install-singlefile ()
>> + "Check properties of the installed single-file package."
>> + (with-package-test (:install '(simple-single))
>> + (let ((autoload-file
>> + (expand-file-name "simple-single-autoloads.el"
>> + (expand-file-name
>> + "simple-single-1.3"
>> + package-test-user-dir)))
>> + (installed-files '("README-elpa"
>> + "simple-single-autoloads.el"
>> + "simple-single-pkg.el"
>> + "simple-single.elc"))
>> + (autoload-forms '("^(autoload 'simple-single-mode"))
>> + (pkg-dir (file-name-as-directory
>> + (expand-file-name
>> + "simple-single-1.3"
>> + package-test-user-dir))))
>> + (package-refresh-contents)
>> + (should (package-installed-p 'simple-single))
>> + (with-temp-buffer
>> + (dolist (fn installed-files)
>> + (should (file-exists-p (expand-file-name fn pkg-dir))))
>
> Shouldn't you move this out of the with-temp-buffer?
Right. I kept it in the `with-temp-buffer' to be consistently
ugly with the test I copied from, `package-test-install-multifile'.
Should I fix it here as part of commit [1]?
And in `package-test-install-multifile' in commit [3]?
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.
Received: (at 79411) by debbugs.gnu.org; 19 Oct 2025 18:32:23 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Oct 19 14:32:23 2025
Received: from localhost ([127.0.0.1]:37725 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1vAYCc-0002Fr-1s
for submit <at> debbugs.gnu.org; Sun, 19 Oct 2025 14:32:23 -0400
Received: from mout01.posteo.de ([185.67.36.65]:53029)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <philipk@HIDDEN>)
id 1vAYCV-0002FW-4J
for 79411 <at> debbugs.gnu.org; Sun, 19 Oct 2025 14:32:19 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id 9F21F240027
for <79411 <at> debbugs.gnu.org>; Sun, 19 Oct 2025 20:32:08 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=posteo.net; s=2017;
t=1760898728; bh=ESw9tSzEpFJXdPxLJjeUhTEymD4NoXPJEMY+r5auqgk=;
h=From:To:Cc:Subject:OpenPGP:Date:Message-ID:MIME-Version:
Content-Type:From;
b=iZHQTki9iSG6etPasxMkWAl8j5Mi+Nxv98noocfThSeu+HTSyyXLUGcv7ikEtYFMl
IlGDadtm3vbEXyu26CLqHmrE07W955itgV8UYz1qZDbiGrit7D7yO5JMia5x+Bcyof
HuoKgrlt7AQ1Ef5ymDshT72qh+DTXhCBdecnX01GLjd8owkBx0KlQgZhBd3ZufG4fW
BVxqmm8KQERuMaYbtkVJCQpN0GMwy5CdCK6v2vgSBuMlnvustuGpsjb9nbckeknDr8
KYsPTgq0wUE7INeDr55SUsWKhgWxgJvYRPLIAB0XJlhAPo4apI+E+suhgCdefo2kZG
/3LqMJYh58UaA==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4cqRx36RLRz9rxF;
Sun, 19 Oct 2025 20:32:07 +0200 (CEST)
From: Philip Kaludercic <philipk@HIDDEN>
To: Jens Schmidt <jschmidt4gnu@HIDDEN>
Subject: Re: bug#79411: 31.0.50; describe-package does not show :readme
after package installation, but sth else
In-Reply-To: <37f04165-802f-4bd8-9762-8e79ec55dd08@HIDDEN>
References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN>
<8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN>
<796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN>
<871pocr7ot.fsf@HIDDEN> <86wm648utt.fsf@HIDDEN>
<87wm64owhk.fsf@HIDDEN>
<8d75da04-15d7-4c40-bb09-912b02aee492@HIDDEN>
<877by2y6u0.fsf@HIDDEN>
<37f04165-802f-4bd8-9762-8e79ec55dd08@HIDDEN>
OpenPGP: id=7126E1DE2F0CE35C770BED01F2C3CC513DB89F66;
url="https://keys.openpgp.org/vks/v1/by-fingerprint/7126E1DE2F0CE35C770BED01F2C3CC513DB89F66";
preference=signencrypt
Date: Sun, 19 Oct 2025 18:32:08 +0000
Message-ID: <87tszuyc7y.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 79411
Cc: 79411 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
Sorry for the delay, I am not that familiar with package-tests.el so I
had to plan in more time to take a proper look at the patches.
Jens Schmidt <jschmidt4gnu@HIDDEN> writes:
> Here comes a first implementation. I do not consider it final
> yet, but I'd like to clarify a couple of questions before
> continuing. Means: Please do not go into "full and detailed
> review mode" yet.
>
> 1. I'm not quite confident about the documentation I added to
> package.texi, it feels a bit out of place there. The rest of
> that section is rather terse and does not go into that level
> of detail as the new paragraph goes. OTOH I haven't found any
> other place where to document these details.
>
> I'm also fine with NOT documenting anything w.r.t this change
> in the Elisp manual.
>
> 2. It turned out that the central test macro, `with-package-test'
> could be simplified a lot. Mostly to replace the hand-made
> temporary directory handling by macro
> `ert-with-temp-directory'. For the time being I kept that in
> a separate commit 0002-Simplify-macro-with-package-test.patch.
> Should I include that change?
>
> If yes, I'd merge both commits and brush them up where still
> needed.
>
> WDYT?
>
> From 764be4cc063cc0d5af788986922249f0b36fe599 Mon Sep 17 00:00:00 2001
> From: Jens Schmidt <farblos@HIDDEN>
> Date: Tue, 30 Sep 2025 22:46:07 +0200
> Subject: [PATCH 2/2] Simplify macro with-package-test
>
> From: Jens Schmidt <jschmidt4gnu@HIDDEN>
>
> * test/lisp/emacs-lisp/package-tests.el (with-package-test): Remove
> unused keyword :update-news, its documentation, and its implementation.
> Redo implementation of keyworf :upload-base to use equivalent macro
> `ert-with-temp-directory' macro.
> ---
> test/lisp/emacs-lisp/package-tests.el | 53 ++++++++-------------------
> 1 file changed, 16 insertions(+), 37 deletions(-)
>
> diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el
> index 95fde634f70..27aa0eb438e 100644
> --- a/test/lisp/emacs-lisp/package-tests.el
> +++ b/test/lisp/emacs-lisp/package-tests.el
> @@ -110,7 +110,6 @@ with-package-test
> basedir
> install
> location
> - update-news
> upload-base)
> &rest body)
> "Set up temporary locations and variables for testing.
> @@ -132,9 +131,6 @@ with-package-test
> :location ARCHIVE-DIR - Use directory ARCHIVE-DIR as package archive
> directory instead of `package-test-user-dir'.
>
> -:update-news UPDATE-NEWS - If UPDATE-NEWS is non-nil, bind
> - `package-update-news-on-upload' to t while executing BODY.
> -
> :upload-base UPDATE-BASE - If UPDATE-BASE is non-nil, create a temporary
> directory, bind `package-archive-upload-base' to the location of that
> while executing BODY, and clean it up after that."
> @@ -149,42 +145,25 @@ with-package-test
> abbreviated-home-dir
> package--initialized
> package-alist
> - package-selected-packages
> - ,@(if update-news
> - '(package-update-news-on-upload t)
> - (list (gensym)))
> - ,@(if upload-base
> - '((package-test-archive-upload-base (make-temp-file "pkg-archive-base-" t))
> - (package-archive-upload-base package-test-archive-upload-base))
> - (list (gensym)))) ;; Dummy value so `let' doesn't try to bind nil
> + package-selected-packages)
> (let ((buf (get-buffer "*Packages*")))
> (when (buffer-live-p buf)
> (kill-buffer buf)))
> - (unwind-protect
> - (progn
> - (unless (file-directory-p package-user-dir)
> - (mkdir package-user-dir))
> - (cl-letf (((symbol-function 'yes-or-no-p) (lambda (&rest _) t))
> - ((symbol-function 'y-or-n-p) (lambda (&rest _) t)))
> - ,@(when install
> - `((package-initialize)
> - (package-refresh-contents)
> - (mapc 'package-install ,install)))
> - (with-temp-buffer
> - ,(if basedir `(cd ,basedir))
> - ,(if file
> - `(insert-file-contents ,file))
> - ,@body)))
> -
> - (when ,upload-base
> - (dolist (f '("archive-contents"
> - "simple-single-1.3.el"
> - "simple-single-1.4.el"
> - "simple-single-readme.txt"))
> - (ignore-errors
> - (delete-file
> - (expand-file-name f package-test-archive-upload-base))))
> - (delete-directory package-test-archive-upload-base))))))
I see, so the code here was just not using the RECURCIVE flag.
> + (unless (file-directory-p package-user-dir)
> + (mkdir package-user-dir))
> + (cl-letf (((symbol-function 'y-or-n-p) (lambda (&rest _) t)))
> + ,@(when install
> + `((package-initialize)
> + (package-refresh-contents)
> + (mapc 'package-install ,install)))
> + (with-temp-buffer
> + ,(if basedir `(cd ,basedir))
> + ,(if file
> + `(insert-file-contents ,file))
> + ,(if upload-base
> + `(ert-with-temp-directory package-archive-upload-base
> + ,@body)
> + `(progn ,@body)))))))
>
> (defmacro with-fake-help-buffer (&rest body)
> "Execute BODY in a temp buffer which is treated as the \"*Help*\" buffer."
> --
> 2.39.5
LGTM
>
> From 800686d052f2933fe43b0b09f22916f5a698d910 Mon Sep 17 00:00:00 2001
> From: Jens Schmidt <farblos@HIDDEN>
> Date: Tue, 30 Sep 2025 22:05:53 +0200
> Subject: [PATCH 1/2] Use a consistent package description
>
> From: Jens Schmidt <jschmidt4gnu@HIDDEN>
>
> Ensure that the long description of a package is the same regardless of
> originating package archive and package installation state.
>
> * doc/lispref/package.texi (Packaging Basics): Describe file
> 'README-elpa' and others that might get created during package
> installation.
> * lisp/emacs-lisp/package.el (package-desc): Updated description of slot
> `kind'.
> (package-install-from-archive): Download '*-readme.txt' from the archive
> and save it as 'README-elpa'.
> * test/lisp/emacs-lisp/package-resources/multi-file-readme.txt:
> * test/lisp/emacs-lisp/package-resources/simple-single-readme.txt:
> Updated readmes to mark them as "server readmes" and distinguish them
> from what the packages themselves provide in their documentation.
> * test/lisp/emacs-lisp/package-tests.el (with-package-test): Add
> documentation. Move `cd' call to where it belongs to, since in the old
> place it affected the only semi-guaranteed temporary buffer provided by
> `ert--run-test-internal'. Remove duplicate directory cleanup code.
> (package-test-install-file, package-test-bug58367, package-test-bug65475)
> (package-test-install-file-EOLs, package-test-install-multifile): Remove
> superfluous :basedir keyword from `with-package-test' calls.
> (package-test-install-file): Fix typo.
> (package-test-describe-installed-with-ws-only-readme)
> (package-test-install-singlefile): Add test.
> (package-test-install-multifile): Test more files for presence.
> (package-test-describe-package)
> (package-test-describe-installed-multi-file-package)
> (package-test-describe-non-installed-package)
> (package-test-describe-non-installed-multi-file-package): Test for
> server readme being used as long description. (Bug#79411)
> ---
> doc/lispref/package.texi | 9 ++
> lisp/emacs-lisp/package.el | 21 ++-
> .../package-resources/multi-file-readme.txt | 2 +-
> .../simple-single-readme.txt | 1 +
> test/lisp/emacs-lisp/package-tests.el | 124 +++++++++++++++---
> 5 files changed, 137 insertions(+), 20 deletions(-)
>
> diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi
> index 41fc6c77dd6..dbf15784983 100644
> --- a/doc/lispref/package.texi
> +++ b/doc/lispref/package.texi
> @@ -95,6 +95,15 @@ Packaging Basics
> package's contents (the single Lisp file for a simple package, or the
> files extracted from a multi-file package).
>
> + If Emacs installs a package from a package archive, it might create
> +some files in addition to the package's contents. If the package
> +archive provides a non-trivial long description for some package, Emacs
> +stores it in a file named @file{README-elpa} in the package's content
> +directory, unless the package itself provides such a file. If a package
> +archive provides package signatures, Emacs stores information on the
> +signatures in files named @file{@var{name}-@var{version}.signed} below
> +directory @code{package-user-dir}.
I don't think that we need to document that here, having a comment in
package.el should be sufficient.
> @cindex package autoloads
> Emacs then searches every Lisp file in the content directory for
> autoload magic comments (@pxref{Autoload}). These autoload
> diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
> index ba9999c20e6..9987673d2ae 100644
> --- a/lisp/emacs-lisp/package.el
> +++ b/lisp/emacs-lisp/package.el
> @@ -516,7 +516,9 @@ package-vc-p
> required version.
>
> `kind' The distribution format of the package. Currently, it is
> - either `single' or `tar'.
> + either `single', `tar', or (temporarily only `dir'). In
The parentheses here are confusing, what are they supposed to mean?
> + addition, there is distribution format `vc', which is
> + handled by package-vc.el.
>
> `archive' The name of the archive (as a string) whence this
> package came.
> @@ -2162,7 +2164,22 @@ package-install-from-archive
> ;; Update the new (activated) pkg-desc as well.
> (when-let* ((pkg-descs (cdr (assq (package-desc-name pkg-desc)
> package-alist))))
> - (setf (package-desc-signed (car pkg-descs)) t))))))))))
> + (setf (package-desc-signed (car pkg-descs)) t))))))))
> + ;; fetch a backup of the readme file from the server. Slot `dir' is
> + ;; not yet available in PKG-DESC, so cobble that up.
> + (let* ((dirname (package-desc-full-name pkg-desc))
> + (pkg-dir (expand-file-name dirname package-user-dir))
> + (readme (expand-file-name "README-elpa" pkg-dir)))
> + (unless (file-readable-p readme)
> + (package--with-response-buffer (package-archive-base pkg-desc)
> + :file (format "%s-readme.txt" (package-desc-name pkg-desc))
> + :noerror t
> + ;; do not write empty or whitespace-only readmes to give
> + ;; `package--get-description' a chance to find another readme
> + (unless (save-excursion
> + (goto-char (point-min))
> + (looking-at-p "[[:space:]]*\\'"))
> + (write-region nil nil readme)))))))
LGTM :)
> ;;;###autoload
> (defun package-installed-p (package &optional min-version)
> diff --git a/test/lisp/emacs-lisp/package-resources/multi-file-readme.txt b/test/lisp/emacs-lisp/package-resources/multi-file-readme.txt
> index affd2e96fb0..d35471eaf97 100644
> --- a/test/lisp/emacs-lisp/package-resources/multi-file-readme.txt
> +++ b/test/lisp/emacs-lisp/package-resources/multi-file-readme.txt
> @@ -1 +1 @@
> -This is a bare-bones readme file for the multi-file package.
> +This is a bare-bones server readme file for the multi-file package.
> diff --git a/test/lisp/emacs-lisp/package-resources/simple-single-readme.txt b/test/lisp/emacs-lisp/package-resources/simple-single-readme.txt
> index 25d3034032b..fa0662937f7 100644
> --- a/test/lisp/emacs-lisp/package-resources/simple-single-readme.txt
> +++ b/test/lisp/emacs-lisp/package-resources/simple-single-readme.txt
> @@ -1,3 +1,4 @@
> This package provides a minor mode to frobnicate and/or bifurcate
> any flanges you desire. To activate it, type "C-M-r M-3 butterfly"
> and all your dreams will come true.
> +This is a server readme file.
> diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el
> index f22051774c8..95fde634f70 100644
> --- a/test/lisp/emacs-lisp/package-tests.el
> +++ b/test/lisp/emacs-lisp/package-tests.el
> @@ -113,7 +113,31 @@ with-package-test
> update-news
> upload-base)
> &rest body)
> - "Set up temporary locations and variables for testing."
> + "Set up temporary locations and variables for testing.
> +Create a temporary buffer and execute BODY in it.
> +
> +This macro interprets the following keywords:
> +
> +:basedir BASEDIR - Change directory to BASEDIR in the temporary buffer
> + before executing BODY.
> + You should use keyword :basedir only when BODY requires it; this macro
> + itself does not require its usage.
> +
> +:file FILE - Execute `insert-file-contents' on FILE in the temporary buffer
> + before executing BODY.
> +
> +:install PACKAGES - Execute `package-install' on each package in list
> + PACKAGES before executing BODY.
> +
> +:location ARCHIVE-DIR - Use directory ARCHIVE-DIR as package archive
> + directory instead of `package-test-user-dir'.
> +
> +:update-news UPDATE-NEWS - If UPDATE-NEWS is non-nil, bind
> + `package-update-news-on-upload' to t while executing BODY.
> +
> +:upload-base UPDATE-BASE - If UPDATE-BASE is non-nil, create a temporary
> + directory, bind `package-archive-upload-base' to the location of that
> + while executing BODY, and clean it up after that."
> (declare (indent 1) (debug (([&rest form]) body)))
> `(ert-with-temp-directory package-test-user-dir
> (let* ((process-environment (cons (format "HOME=%s" package-test-user-dir)
> @@ -138,7 +162,6 @@ with-package-test
> (kill-buffer buf)))
> (unwind-protect
> (progn
> - ,(if basedir `(cd ,basedir))
> (unless (file-directory-p package-user-dir)
> (mkdir package-user-dir))
> (cl-letf (((symbol-function 'yes-or-no-p) (lambda (&rest _) t))
> @@ -148,6 +171,7 @@ with-package-test
> (package-refresh-contents)
> (mapc 'package-install ,install)))
> (with-temp-buffer
> + ,(if basedir `(cd ,basedir))
Why do we do this in the first place instead of binding default-directory?
> ,(if file
> `(insert-file-contents ,file))
> ,@body)))
> @@ -160,11 +184,7 @@ with-package-test
> (ignore-errors
> (delete-file
> (expand-file-name f package-test-archive-upload-base))))
> - (delete-directory package-test-archive-upload-base))
> -
> - (when (and (boundp 'package-test-archive-upload-base)
> - (file-directory-p package-test-archive-upload-base))
> - (delete-directory package-test-archive-upload-base t))))))
> + (delete-directory package-test-archive-upload-base))))))
>
> (defmacro with-fake-help-buffer (&rest body)
> "Execute BODY in a temp buffer which is treated as the \"*Help*\" buffer."
> @@ -269,7 +289,7 @@ package-test-install-single
>
> (ert-deftest package-test-install-file ()
> "Install files with `package-install-file'."
> - (with-package-test (:basedir (ert-resource-directory))
> + (with-package-test ()
> (package-initialize)
> (let* ((pkg-el "simple-single-1.3.el")
> (source-file (expand-file-name pkg-el (ert-resource-directory))))
> @@ -281,14 +301,14 @@ package-test-install-file
>
> (let* ((pkg-el "multi-file-0.2.3.tar")
> (source-file (expand-file-name pkg-el (ert-resource-directory))))
> - (should-not (package-installed-p 'multie-file))
> + (should-not (package-installed-p 'multi-file))
I would refrain from these kinds of little changes, as they make
git-blame(1) less informative.
> (package-install-file source-file)
> (should (package-installed-p 'multi-file))
> (package-delete (cadr (assq 'multi-file package-alist))))))
>
> (ert-deftest package-test-bug58367 ()
> "Check variations in tarball formats."
> - (with-package-test (:basedir (ert-resource-directory))
> + (with-package-test ()
> (package-initialize)
>
> ;; A package whose first entry is the main dir but without trailing /.
> @@ -310,7 +330,7 @@ package-test-bug58367
>
> (ert-deftest package-test-bug65475 ()
> "Deleting the last package clears `package-selected-packages'."
> - (with-package-test (:basedir (ert-resource-directory))
> + (with-package-test ()
> (package-initialize)
> (let* ((pkg-el "simple-single-1.3.el")
> (source-file (expand-file-name pkg-el (ert-resource-directory))))
> @@ -326,7 +346,7 @@ package-test-bug65475
> (ert-deftest package-test-install-file-EOLs ()
> "Install same file multiple time with `package-install-file'
> but with a different end of line convention (bug#48137)."
> - (with-package-test (:basedir (ert-resource-directory))
> + (with-package-test ()
> (package-initialize)
> (let* ((pkg-el "simple-single-1.3.el")
> (source-file (expand-file-name pkg-el (ert-resource-directory))))
> @@ -466,16 +486,48 @@ package-test-install-prioritized
> (should (version-list-= '(1 3)
> (package-desc-version installed)))))))
>
> +(ert-deftest package-test-install-singlefile ()
> + "Check properties of the installed single-file package."
> + (with-package-test (:install '(simple-single))
> + (let ((autoload-file
> + (expand-file-name "simple-single-autoloads.el"
> + (expand-file-name
> + "simple-single-1.3"
> + package-test-user-dir)))
> + (installed-files '("README-elpa"
> + "simple-single-autoloads.el"
> + "simple-single-pkg.el"
> + "simple-single.elc"))
> + (autoload-forms '("^(autoload 'simple-single-mode"))
> + (pkg-dir (file-name-as-directory
> + (expand-file-name
> + "simple-single-1.3"
> + package-test-user-dir))))
> + (package-refresh-contents)
> + (should (package-installed-p 'simple-single))
> + (with-temp-buffer
> + (dolist (fn installed-files)
> + (should (file-exists-p (expand-file-name fn pkg-dir))))
Shouldn't you move this out of the with-temp-buffer?
> + (insert-file-contents-literally autoload-file)
> + (dolist (re autoload-forms)
> + (goto-char (point-min))
> + (should (re-search-forward re nil t)))))))
> +
> (ert-deftest package-test-install-multifile ()
> "Check properties of the installed multi-file package."
> - (with-package-test (:basedir (ert-resource-directory) :install '(multi-file))
> + (with-package-test (:install '(multi-file))
> (let ((autoload-file
> (expand-file-name "multi-file-autoloads.el"
> (expand-file-name
> "multi-file-0.2.3"
> package-test-user-dir)))
> - (installed-files '("dir" "multi-file.info" "multi-file-sub.elc"
> - "multi-file-autoloads.el" "multi-file.elc"))
> + (installed-files '(;; already present in tar
> + "README" "dir" "multi-file.info"
> + ;; generated during installation
> + "README-elpa"
> + "multi-file-autoloads.el"
> + "multi-file-sub.elc"
> + "multi-file.elc"))
> (autoload-forms '("^(defvar multi-file-custom-var"
> "^(custom-autoload 'multi-file-custom-var"
> "^(autoload 'multi-file-mode"))
> @@ -695,6 +747,17 @@ package-test-package-installed-p
> (should (package-installed-p 'project nil))
> (should (not (package-installed-p 'imaginary-package nil)))))
>
> +;; The long description of installed packages should primarily come from
> +;; the package archive through file *-readme.txt stored in README-elpa,
> +;; and not from any README (or commentary) of the package itself. So
> +;; below we intentionally test for the contents of files *-readme.txt
> +;; ("*server* readme"), which differs from what the simple-single-1.3.el
> +;; or multi-file-0.2.3.tar/README contain.
> +;;
> +;; If the package archive provides a whitespace-only file *-readme.txt,
> +;; then that should *not* be used as README-elpa, so that
> +;; `describe-package' tries to come up with something reasonable itself.
> +
> (ert-deftest package-test-describe-package ()
> "Test displaying help for a package."
>
> @@ -725,8 +788,33 @@ package-test-describe-package
> (save-excursion (should (re-search-forward "Keywords: \\[?frobnicate\\]?" nil t)))
> (save-excursion (should (search-forward "This package provides a minor mode to frobnicate"
> nil t)))
> + (save-excursion (should (search-forward "This is a server readme file."
> + nil t)))
> )))
>
> +(ert-deftest package-test-describe-installed-with-ws-only-readme ()
> + "Test displaying of the readme for installed package with ws-only readme."
> +
> + (ert-with-temp-directory temp-archive
> + (copy-file (ert-resource-file "archive-contents") temp-archive)
> + (copy-file (ert-resource-file "simple-single-1.3.el") temp-archive)
> + (with-temp-buffer
> + (insert " \t\n\t \n")
> + (write-region nil nil (expand-file-name "simple-single-readme.txt"
> + temp-archive)))
> + (with-package-test (:location temp-archive)
> + (package-initialize)
> + (package-refresh-contents)
> + (package-install 'simple-single)
> + (with-fake-help-buffer
> + (describe-package 'simple-single)
> + (goto-char (point-min))
> + (should (search-forward "Package simple-single is installed." nil t))
> + (save-excursion (should (search-forward "This package provides a minor mode to frobnicate"
> + nil t)))
I'd break these lines, they appear to be too long. You don't have to do
that in other places, we can make those changes gradually over time.
> + (save-excursion (should-not (search-forward "This is a server readme file."
> + nil t)))))))
> +
> (ert-deftest package-test-describe-installed-multi-file-package ()
> "Test displaying of the readme for installed multi-file package."
>
> @@ -738,7 +826,7 @@ package-test-describe-installed-multi-file-package
> (describe-package 'multi-file)
> (goto-char (point-min))
> (should (search-forward "Website: http://puddles.li" nil t))
> - (should (search-forward "This is a bare-bones readme file for the multi-file"
> + (should (search-forward "This is a bare-bones server readme file for the multi-file"
> nil t)))))
>
> (ert-deftest package-test-describe-non-installed-package ()
> @@ -752,6 +840,8 @@ package-test-describe-non-installed-package
> (goto-char (point-min))
> (should (search-forward "Website: http://doodles.au" nil t))
> (should (search-forward "This package provides a minor mode to frobnicate"
> + nil t))
> + (should (search-forward "This is a server readme file."
> nil t)))))
>
> (ert-deftest package-test-describe-non-installed-multi-file-package ()
> @@ -764,7 +854,7 @@ package-test-describe-non-installed-multi-file-package
> (describe-package 'multi-file)
> (goto-char (point-min))
> (should (search-forward "Website: http://puddles.li" nil t))
> - (should (search-forward "This is a bare-bones readme file for the multi-file"
> + (should (search-forward "This is a bare-bones server readme file for the multi-file"
> nil t)))))
>
> (defvar epg-config--program-alist) ; Silence byte-compiler.
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.Received: (at 79411) by debbugs.gnu.org; 12 Oct 2025 13:45:03 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Oct 12 09:45:03 2025 Received: from localhost ([127.0.0.1]:48077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1v7wNi-0000Es-Kr for submit <at> debbugs.gnu.org; Sun, 12 Oct 2025 09:45:03 -0400 Received: from mr5.vodafonemail.de ([145.253.228.165]:56418) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <jschmidt4gnu@HIDDEN>) id 1v7wNd-0000Cm-0u for 79411 <at> debbugs.gnu.org; Sun, 12 Oct 2025 09:45:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vodafonemail.de; s=vfde-mb-mr2-23sep; t=1760276689; bh=cKj7easmkMwmgUYPq+V1/hERiYwqGedsA3IK5y2EWik=; h=Message-ID:Date:User-Agent:Subject:From:To:References: Content-Language:In-Reply-To:Content-Type:From; b=1kZn9u3a8ni/QB6i1JlhxdY27IafwfvQMteV5+BCxdxfbUCT4e+HzlNs63erC9LCX c1DSehZZNAYdhzIR+85rXv/CQhawzWqbDDUqbV3rJerGsGlnXHZnMfBJ+8GOGpNpYY bkfAgvU/XEuhbEr//UzygVd85uBVOzZ3VgWwfoRU= Received: from smtp.vodafone.de (unknown [10.0.0.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by mr5.vodafonemail.de (Postfix) with ESMTPS id 4cl1tn6dC8z1yNN; Sun, 12 Oct 2025 13:44:49 +0000 (UTC) Received: from [192.168.178.41] (port-92-199-211-34.dynamic.as20676.net [92.199.211.34]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.vodafone.de (Postfix) with ESMTPSA id 4cl1tf2cRDz918Z; Sun, 12 Oct 2025 13:44:39 +0000 (UTC) Message-ID: <79835ef8-4234-4668-b790-321ed866d775@HIDDEN> Date: Sun, 12 Oct 2025 15:44:38 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Bump on bug#79411: 31.0.50; describe-package does not show :readme after package installation, but sth else From: Jens Schmidt <jschmidt4gnu@HIDDEN> To: Philip Kaludercic <philipk@HIDDEN> References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN> <8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN> <796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN> <871pocr7ot.fsf@HIDDEN> <86wm648utt.fsf@HIDDEN> <87wm64owhk.fsf@HIDDEN> <8d75da04-15d7-4c40-bb09-912b02aee492@HIDDEN> <877by2y6u0.fsf@HIDDEN> <37f04165-802f-4bd8-9762-8e79ec55dd08@HIDDEN> Content-Language: de-DE-frami, en-US In-Reply-To: <37f04165-802f-4bd8-9762-8e79ec55dd08@HIDDEN> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-purgate-type: clean X-purgate: clean X-purgate-size: 1197 X-purgate-ID: 155817::1760276685-B7413F8E-1CC8B700/0/0 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 79411 Cc: 79411 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Hi Philip, any chance to have a look at this? Thanks! On 2025-09-30 23:27, Jens Schmidt wrote: > Here comes a first implementation. I do not consider it final > yet, but I'd like to clarify a couple of questions before > continuing. Means: Please do not go into "full and detailed > review mode" yet. > > 1. I'm not quite confident about the documentation I added to > package.texi, it feels a bit out of place there. The rest of > that section is rather terse and does not go into that level > of detail as the new paragraph goes. OTOH I haven't found any > other place where to document these details. > > I'm also fine with NOT documenting anything w.r.t this change > in the Elisp manual. > > 2. It turned out that the central test macro, `with-package-test' > could be simplified a lot. Mostly to replace the hand-made > temporary directory handling by macro > `ert-with-temp-directory'. For the time being I kept that in > a separate commit 0002-Simplify-macro-with-package-test.patch. > Should I include that change? > > If yes, I'd merge both commits and brush them up where still > needed. > > WDYT?
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.Received: (at 79411) by debbugs.gnu.org; 30 Sep 2025 21:28:28 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 30 17:28:28 2025 Received: from localhost ([127.0.0.1]:60697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1v3htW-0008Dv-Q2 for submit <at> debbugs.gnu.org; Tue, 30 Sep 2025 17:28:27 -0400 Received: from mr4.vodafonemail.de ([145.253.228.164]:60566) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <jschmidt4gnu@HIDDEN>) id 1v3htK-0008DT-Lx for 79411 <at> debbugs.gnu.org; Tue, 30 Sep 2025 17:28:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vodafonemail.de; s=vfde-mb-mr2-23sep; t=1759267682; bh=Of/OV6Jpnw2gyBREs272XquYEluZN9vfFef9jeh9O7s=; h=Content-Type:Message-ID:Date:User-Agent:Subject:To:References: From:Content-Language:In-Reply-To:From; b=VwqgZfV68rgGhHtoeP5l4kp8uBRvsBbM1hHGzNB7a4UNg3nrf6TJQ0LyPWdm+JAJM vm0zn7jDUCB/mJJ/oy83AbR2+L1qR6K2loUKp5+D9Iaki9xgN7lha5EdO9exFzOHho elLrMerikY5tHmcoxUa5JOZEvsEf24sG5bbc5j9M= Received: from smtp.vodafone.de (unknown [10.0.0.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by mr4.vodafonemail.de (Postfix) with ESMTPS id 4cbrkp6q86z20nP; Tue, 30 Sep 2025 21:28:02 +0000 (UTC) Received: from [192.168.178.42] (port-92-199-214-122.dynamic.as20676.net [92.199.214.122]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.vodafone.de (Postfix) with ESMTPSA id 4cbrkf75DNz92kQ; Tue, 30 Sep 2025 21:27:51 +0000 (UTC) Content-Type: multipart/mixed; boundary="------------LLha6oxRMC0oJOmXwHyXJfob" Message-ID: <37f04165-802f-4bd8-9762-8e79ec55dd08@HIDDEN> Date: Tue, 30 Sep 2025 23:27:51 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#79411: 31.0.50; describe-package does not show :readme after package installation, but sth else To: Philip Kaludercic <philipk@HIDDEN> References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN> <8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN> <796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN> <871pocr7ot.fsf@HIDDEN> <86wm648utt.fsf@HIDDEN> <87wm64owhk.fsf@HIDDEN> <8d75da04-15d7-4c40-bb09-912b02aee492@HIDDEN> <877by2y6u0.fsf@HIDDEN> From: Jens Schmidt <jschmidt4gnu@HIDDEN> Content-Language: de-DE-frami, en-US In-Reply-To: <877by2y6u0.fsf@HIDDEN> X-purgate-type: clean X-purgate: clean X-purgate-size: 32103 X-purgate-ID: 155817::1759267678-D4F6D8B7-EBB8F17C/0/0 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 79411 Cc: 79411 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) This is a multi-part message in MIME format. --------------LLha6oxRMC0oJOmXwHyXJfob Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Here comes a first implementation. I do not consider it final yet, but I'd like to clarify a couple of questions before continuing. Means: Please do not go into "full and detailed review mode" yet. 1. I'm not quite confident about the documentation I added to package.texi, it feels a bit out of place there. The rest of that section is rather terse and does not go into that level of detail as the new paragraph goes. OTOH I haven't found any other place where to document these details. I'm also fine with NOT documenting anything w.r.t this change in the Elisp manual. 2. It turned out that the central test macro, `with-package-test' could be simplified a lot. Mostly to replace the hand-made temporary directory handling by macro `ert-with-temp-directory'. For the time being I kept that in a separate commit 0002-Simplify-macro-with-package-test.patch. Should I include that change? If yes, I'd merge both commits and brush them up where still needed. WDYT? --------------LLha6oxRMC0oJOmXwHyXJfob Content-Type: text/x-patch; charset=UTF-8; name="0002-Simplify-macro-with-package-test.patch" Content-Disposition: attachment; filename="0002-Simplify-macro-with-package-test.patch" Content-Transfer-Encoding: base64 RnJvbSA3NjRiZTRjYzA2M2NjMGQ1YWY3ODg5ODY5MjIyNDlmMGIzNmZlNTk5IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKZW5zIFNjaG1pZHQgPGZhcmJsb3NAdm9kYWZvbmVt YWlsLmRlPgpEYXRlOiBUdWUsIDMwIFNlcCAyMDI1IDIyOjQ2OjA3ICswMjAwClN1YmplY3Q6 IFtQQVRDSCAyLzJdIFNpbXBsaWZ5IG1hY3JvIHdpdGgtcGFja2FnZS10ZXN0CgpGcm9tOiBK ZW5zIFNjaG1pZHQgPGpzY2htaWR0NGdudUB2b2RhZm9uZW1haWwuZGU+CgoqIHRlc3QvbGlz cC9lbWFjcy1saXNwL3BhY2thZ2UtdGVzdHMuZWwgKHdpdGgtcGFja2FnZS10ZXN0KTogUmVt b3ZlCnVudXNlZCBrZXl3b3JkIDp1cGRhdGUtbmV3cywgaXRzIGRvY3VtZW50YXRpb24sIGFu ZCBpdHMgaW1wbGVtZW50YXRpb24uClJlZG8gaW1wbGVtZW50YXRpb24gb2Yga2V5d29yZiA6 dXBsb2FkLWJhc2UgdG8gdXNlIGVxdWl2YWxlbnQgbWFjcm8KYGVydC13aXRoLXRlbXAtZGly ZWN0b3J5JyBtYWNyby4KLS0tCiB0ZXN0L2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLXRlc3Rz LmVsIHwgNTMgKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MTYgaW5zZXJ0aW9ucygrKSwgMzcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdGVzdC9s aXNwL2VtYWNzLWxpc3AvcGFja2FnZS10ZXN0cy5lbCBiL3Rlc3QvbGlzcC9lbWFjcy1saXNw L3BhY2thZ2UtdGVzdHMuZWwKaW5kZXggOTVmZGU2MzRmNzAuLjI3YWEwZWI0MzhlIDEwMDY0 NAotLS0gYS90ZXN0L2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLXRlc3RzLmVsCisrKyBiL3Rl c3QvbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UtdGVzdHMuZWwKQEAgLTExMCw3ICsxMTAsNiBA QCB3aXRoLXBhY2thZ2UtdGVzdAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGJhc2VkaXIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBpbnN0YWxsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbG9jYXRpb24KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB1cGRhdGUtbmV3cwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHVwbG9hZC1iYXNlKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAm cmVzdCBib2R5KQogICAiU2V0IHVwIHRlbXBvcmFyeSBsb2NhdGlvbnMgYW5kIHZhcmlhYmxl cyBmb3IgdGVzdGluZy4KQEAgLTEzMiw5ICsxMzEsNiBAQCB3aXRoLXBhY2thZ2UtdGVzdAog OmxvY2F0aW9uIEFSQ0hJVkUtRElSIC0gVXNlIGRpcmVjdG9yeSBBUkNISVZFLURJUiBhcyBw YWNrYWdlIGFyY2hpdmUKICAgZGlyZWN0b3J5IGluc3RlYWQgb2YgYHBhY2thZ2UtdGVzdC11 c2VyLWRpcicuCiAKLTp1cGRhdGUtbmV3cyBVUERBVEUtTkVXUyAtIElmIFVQREFURS1ORVdT IGlzIG5vbi1uaWwsIGJpbmQKLSAgYHBhY2thZ2UtdXBkYXRlLW5ld3Mtb24tdXBsb2FkJyB0 byB0IHdoaWxlIGV4ZWN1dGluZyBCT0RZLgotCiA6dXBsb2FkLWJhc2UgVVBEQVRFLUJBU0Ug LSBJZiBVUERBVEUtQkFTRSBpcyBub24tbmlsLCBjcmVhdGUgYSB0ZW1wb3JhcnkKICAgZGly ZWN0b3J5LCBiaW5kIGBwYWNrYWdlLWFyY2hpdmUtdXBsb2FkLWJhc2UnIHRvIHRoZSBsb2Nh dGlvbiBvZiB0aGF0CiAgIHdoaWxlIGV4ZWN1dGluZyBCT0RZLCBhbmQgY2xlYW4gaXQgdXAg YWZ0ZXIgdGhhdC4iCkBAIC0xNDksNDIgKzE0NSwyNSBAQCB3aXRoLXBhY2thZ2UtdGVzdAog ICAgICAgICAgICAgYWJicmV2aWF0ZWQtaG9tZS1kaXIKICAgICAgICAgICAgIHBhY2thZ2Ut LWluaXRpYWxpemVkCiAgICAgICAgICAgICBwYWNrYWdlLWFsaXN0Ci0gICAgICAgICAgICBw YWNrYWdlLXNlbGVjdGVkLXBhY2thZ2VzCi0gICAgICAgICAgICAsQChpZiB1cGRhdGUtbmV3 cwotICAgICAgICAgICAgICAgICAgJyhwYWNrYWdlLXVwZGF0ZS1uZXdzLW9uLXVwbG9hZCB0 KQotICAgICAgICAgICAgICAgIChsaXN0IChnZW5zeW0pKSkKLSAgICAgICAgICAgICxAKGlm IHVwbG9hZC1iYXNlCi0gICAgICAgICAgICAgICAgICAnKChwYWNrYWdlLXRlc3QtYXJjaGl2 ZS11cGxvYWQtYmFzZSAobWFrZS10ZW1wLWZpbGUgInBrZy1hcmNoaXZlLWJhc2UtIiB0KSkK LSAgICAgICAgICAgICAgICAgICAgKHBhY2thZ2UtYXJjaGl2ZS11cGxvYWQtYmFzZSBwYWNr YWdlLXRlc3QtYXJjaGl2ZS11cGxvYWQtYmFzZSkpCi0gICAgICAgICAgICAgICAgKGxpc3Qg KGdlbnN5bSkpKSkgOzsgRHVtbXkgdmFsdWUgc28gYGxldCcgZG9lc24ndCB0cnkgdG8gYmlu ZCBuaWwKKyAgICAgICAgICAgIHBhY2thZ2Utc2VsZWN0ZWQtcGFja2FnZXMpCiAgICAgICAg KGxldCAoKGJ1ZiAoZ2V0LWJ1ZmZlciAiKlBhY2thZ2VzKiIpKSkKICAgICAgICAgICh3aGVu IChidWZmZXItbGl2ZS1wIGJ1ZikKICAgICAgICAgICAgKGtpbGwtYnVmZmVyIGJ1ZikpKQot ICAgICAgICh1bndpbmQtcHJvdGVjdAotICAgICAgICAgICAocHJvZ24KLSAgICAgICAgICAg ICAodW5sZXNzIChmaWxlLWRpcmVjdG9yeS1wIHBhY2thZ2UtdXNlci1kaXIpCi0gICAgICAg ICAgICAgICAobWtkaXIgcGFja2FnZS11c2VyLWRpcikpCi0gICAgICAgICAgICAgKGNsLWxl dGYgKCgoc3ltYm9sLWZ1bmN0aW9uICd5ZXMtb3Itbm8tcCkgKGxhbWJkYSAoJnJlc3QgXykg dCkpCi0gICAgICAgICAgICAgICAgICAgICAgICgoc3ltYm9sLWZ1bmN0aW9uICd5LW9yLW4t cCkgICAgKGxhbWJkYSAoJnJlc3QgXykgdCkpKQotICAgICAgICAgICAgICAgLEAod2hlbiBp bnN0YWxsCi0gICAgICAgICAgICAgICAgICAgYCgocGFja2FnZS1pbml0aWFsaXplKQotICAg ICAgICAgICAgICAgICAgICAgKHBhY2thZ2UtcmVmcmVzaC1jb250ZW50cykKLSAgICAgICAg ICAgICAgICAgICAgIChtYXBjICdwYWNrYWdlLWluc3RhbGwgLGluc3RhbGwpKSkKLSAgICAg ICAgICAgICAgICh3aXRoLXRlbXAtYnVmZmVyCi0gICAgICAgICAgICAgICAgICwoaWYgYmFz ZWRpciBgKGNkICxiYXNlZGlyKSkKLSAgICAgICAgICAgICAgICAgLChpZiBmaWxlCi0gICAg ICAgICAgICAgICAgICAgICAgYChpbnNlcnQtZmlsZS1jb250ZW50cyAsZmlsZSkpCi0gICAg ICAgICAgICAgICAgICxAYm9keSkpKQotCi0gICAgICAgICAod2hlbiAsdXBsb2FkLWJhc2UK LSAgICAgICAgICAgKGRvbGlzdCAoZiAnKCJhcmNoaXZlLWNvbnRlbnRzIgotICAgICAgICAg ICAgICAgICAgICAgICAgInNpbXBsZS1zaW5nbGUtMS4zLmVsIgotICAgICAgICAgICAgICAg ICAgICAgICAgInNpbXBsZS1zaW5nbGUtMS40LmVsIgotICAgICAgICAgICAgICAgICAgICAg ICAgInNpbXBsZS1zaW5nbGUtcmVhZG1lLnR4dCIpKQotICAgICAgICAgICAgIChpZ25vcmUt ZXJyb3JzCi0gICAgICAgICAgICAgICAoZGVsZXRlLWZpbGUKLSAgICAgICAgICAgICAgICAo ZXhwYW5kLWZpbGUtbmFtZSBmIHBhY2thZ2UtdGVzdC1hcmNoaXZlLXVwbG9hZC1iYXNlKSkp KQotICAgICAgICAgICAoZGVsZXRlLWRpcmVjdG9yeSBwYWNrYWdlLXRlc3QtYXJjaGl2ZS11 cGxvYWQtYmFzZSkpKSkpKQorICAgICAgICh1bmxlc3MgKGZpbGUtZGlyZWN0b3J5LXAgcGFj a2FnZS11c2VyLWRpcikKKyAgICAgICAgIChta2RpciBwYWNrYWdlLXVzZXItZGlyKSkKKyAg ICAgICAoY2wtbGV0ZiAoKChzeW1ib2wtZnVuY3Rpb24gJ3ktb3Itbi1wKSAobGFtYmRhICgm cmVzdCBfKSB0KSkpCisgICAgICAgICAsQCh3aGVuIGluc3RhbGwKKyAgICAgICAgICAgICBg KChwYWNrYWdlLWluaXRpYWxpemUpCisgICAgICAgICAgICAgICAocGFja2FnZS1yZWZyZXNo LWNvbnRlbnRzKQorICAgICAgICAgICAgICAgKG1hcGMgJ3BhY2thZ2UtaW5zdGFsbCAsaW5z dGFsbCkpKQorICAgICAgICAgKHdpdGgtdGVtcC1idWZmZXIKKyAgICAgICAgICAgLChpZiBi YXNlZGlyIGAoY2QgLGJhc2VkaXIpKQorICAgICAgICAgICAsKGlmIGZpbGUKKyAgICAgICAg ICAgICAgICBgKGluc2VydC1maWxlLWNvbnRlbnRzICxmaWxlKSkKKyAgICAgICAgICAgLChp ZiB1cGxvYWQtYmFzZQorICAgICAgICAgICAgICAgIGAoZXJ0LXdpdGgtdGVtcC1kaXJlY3Rv cnkgcGFja2FnZS1hcmNoaXZlLXVwbG9hZC1iYXNlCisgICAgICAgICAgICAgICAgICAgLEBi b2R5KQorICAgICAgICAgICAgICBgKHByb2duICxAYm9keSkpKSkpKSkKIAogKGRlZm1hY3Jv IHdpdGgtZmFrZS1oZWxwLWJ1ZmZlciAoJnJlc3QgYm9keSkKICAgIkV4ZWN1dGUgQk9EWSBp biBhIHRlbXAgYnVmZmVyIHdoaWNoIGlzIHRyZWF0ZWQgYXMgdGhlIFwiKkhlbHAqXCIgYnVm ZmVyLiIKLS0gCjIuMzkuNQoK --------------LLha6oxRMC0oJOmXwHyXJfob Content-Type: text/x-patch; charset=UTF-8; name="0001-Use-a-consistent-package-description.patch" Content-Disposition: attachment; filename="0001-Use-a-consistent-package-description.patch" Content-Transfer-Encoding: base64 RnJvbSA4MDA2ODZkMDUyZjI5MzNmZTQzYjBiMDlmMjI5MTZmNWE2OThkOTEwIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKZW5zIFNjaG1pZHQgPGZhcmJsb3NAdm9kYWZvbmVt YWlsLmRlPgpEYXRlOiBUdWUsIDMwIFNlcCAyMDI1IDIyOjA1OjUzICswMjAwClN1YmplY3Q6 IFtQQVRDSCAxLzJdIFVzZSBhIGNvbnNpc3RlbnQgcGFja2FnZSBkZXNjcmlwdGlvbgoKRnJv bTogSmVucyBTY2htaWR0IDxqc2NobWlkdDRnbnVAdm9kYWZvbmVtYWlsLmRlPgoKRW5zdXJl IHRoYXQgdGhlIGxvbmcgZGVzY3JpcHRpb24gb2YgYSBwYWNrYWdlIGlzIHRoZSBzYW1lIHJl Z2FyZGxlc3Mgb2YKb3JpZ2luYXRpbmcgcGFja2FnZSBhcmNoaXZlIGFuZCBwYWNrYWdlIGlu c3RhbGxhdGlvbiBzdGF0ZS4KCiogZG9jL2xpc3ByZWYvcGFja2FnZS50ZXhpIChQYWNrYWdp bmcgQmFzaWNzKTogRGVzY3JpYmUgZmlsZQonUkVBRE1FLWVscGEnIGFuZCBvdGhlcnMgdGhh dCBtaWdodCBnZXQgY3JlYXRlZCBkdXJpbmcgcGFja2FnZQppbnN0YWxsYXRpb24uCiogbGlz cC9lbWFjcy1saXNwL3BhY2thZ2UuZWwgKHBhY2thZ2UtZGVzYyk6IFVwZGF0ZWQgZGVzY3Jp cHRpb24gb2Ygc2xvdApga2luZCcuCihwYWNrYWdlLWluc3RhbGwtZnJvbS1hcmNoaXZlKTog RG93bmxvYWQgJyotcmVhZG1lLnR4dCcgZnJvbSB0aGUgYXJjaGl2ZQphbmQgc2F2ZSBpdCBh cyAnUkVBRE1FLWVscGEnLgoqIHRlc3QvbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UtcmVzb3Vy Y2VzL211bHRpLWZpbGUtcmVhZG1lLnR4dDoKKiB0ZXN0L2xpc3AvZW1hY3MtbGlzcC9wYWNr YWdlLXJlc291cmNlcy9zaW1wbGUtc2luZ2xlLXJlYWRtZS50eHQ6ClVwZGF0ZWQgcmVhZG1l cyB0byBtYXJrIHRoZW0gYXMgInNlcnZlciByZWFkbWVzIiBhbmQgZGlzdGluZ3Vpc2ggdGhl bQpmcm9tIHdoYXQgdGhlIHBhY2thZ2VzIHRoZW1zZWx2ZXMgcHJvdmlkZSBpbiB0aGVpciBk b2N1bWVudGF0aW9uLgoqIHRlc3QvbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UtdGVzdHMuZWwg KHdpdGgtcGFja2FnZS10ZXN0KTogQWRkCmRvY3VtZW50YXRpb24uICBNb3ZlIGBjZCcgY2Fs bCB0byB3aGVyZSBpdCBiZWxvbmdzIHRvLCBzaW5jZSBpbiB0aGUgb2xkCnBsYWNlIGl0IGFm ZmVjdGVkIHRoZSBvbmx5IHNlbWktZ3VhcmFudGVlZCB0ZW1wb3JhcnkgYnVmZmVyIHByb3Zp ZGVkIGJ5CmBlcnQtLXJ1bi10ZXN0LWludGVybmFsJy4gIFJlbW92ZSBkdXBsaWNhdGUgZGly ZWN0b3J5IGNsZWFudXAgY29kZS4KKHBhY2thZ2UtdGVzdC1pbnN0YWxsLWZpbGUsIHBhY2th Z2UtdGVzdC1idWc1ODM2NywgcGFja2FnZS10ZXN0LWJ1ZzY1NDc1KQoocGFja2FnZS10ZXN0 LWluc3RhbGwtZmlsZS1FT0xzLCBwYWNrYWdlLXRlc3QtaW5zdGFsbC1tdWx0aWZpbGUpOiBS ZW1vdmUKc3VwZXJmbHVvdXMgOmJhc2VkaXIga2V5d29yZCBmcm9tIGB3aXRoLXBhY2thZ2Ut dGVzdCcgY2FsbHMuCihwYWNrYWdlLXRlc3QtaW5zdGFsbC1maWxlKTogRml4IHR5cG8uCihw YWNrYWdlLXRlc3QtZGVzY3JpYmUtaW5zdGFsbGVkLXdpdGgtd3Mtb25seS1yZWFkbWUpCihw YWNrYWdlLXRlc3QtaW5zdGFsbC1zaW5nbGVmaWxlKTogQWRkIHRlc3QuCihwYWNrYWdlLXRl c3QtaW5zdGFsbC1tdWx0aWZpbGUpOiBUZXN0IG1vcmUgZmlsZXMgZm9yIHByZXNlbmNlLgoo cGFja2FnZS10ZXN0LWRlc2NyaWJlLXBhY2thZ2UpCihwYWNrYWdlLXRlc3QtZGVzY3JpYmUt aW5zdGFsbGVkLW11bHRpLWZpbGUtcGFja2FnZSkKKHBhY2thZ2UtdGVzdC1kZXNjcmliZS1u b24taW5zdGFsbGVkLXBhY2thZ2UpCihwYWNrYWdlLXRlc3QtZGVzY3JpYmUtbm9uLWluc3Rh bGxlZC1tdWx0aS1maWxlLXBhY2thZ2UpOiBUZXN0IGZvcgpzZXJ2ZXIgcmVhZG1lIGJlaW5n IHVzZWQgYXMgbG9uZyBkZXNjcmlwdGlvbi4gKEJ1ZyM3OTQxMSkKLS0tCiBkb2MvbGlzcHJl Zi9wYWNrYWdlLnRleGkgICAgICAgICAgICAgICAgICAgICAgfCAgIDkgKysKIGxpc3AvZW1h Y3MtbGlzcC9wYWNrYWdlLmVsICAgICAgICAgICAgICAgICAgICB8ICAyMSArKy0KIC4uLi9w YWNrYWdlLXJlc291cmNlcy9tdWx0aS1maWxlLXJlYWRtZS50eHQgICB8ICAgMiArLQogLi4u L3NpbXBsZS1zaW5nbGUtcmVhZG1lLnR4dCAgICAgICAgICAgICAgICAgIHwgICAxICsKIHRl c3QvbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UtdGVzdHMuZWwgICAgICAgICB8IDEyNCArKysr KysrKysrKysrKystLS0KIDUgZmlsZXMgY2hhbmdlZCwgMTM3IGluc2VydGlvbnMoKyksIDIw IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RvYy9saXNwcmVmL3BhY2thZ2UudGV4aSBi L2RvYy9saXNwcmVmL3BhY2thZ2UudGV4aQppbmRleCA0MWZjNmM3N2RkNi4uZGJmMTU3ODQ5 ODMgMTAwNjQ0Ci0tLSBhL2RvYy9saXNwcmVmL3BhY2thZ2UudGV4aQorKysgYi9kb2MvbGlz cHJlZi9wYWNrYWdlLnRleGkKQEAgLTk1LDYgKzk1LDE1IEBAIFBhY2thZ2luZyBCYXNpY3MK IHBhY2thZ2UncyBjb250ZW50cyAodGhlIHNpbmdsZSBMaXNwIGZpbGUgZm9yIGEgc2ltcGxl IHBhY2thZ2UsIG9yIHRoZQogZmlsZXMgZXh0cmFjdGVkIGZyb20gYSBtdWx0aS1maWxlIHBh Y2thZ2UpLgogCisgIElmIEVtYWNzIGluc3RhbGxzIGEgcGFja2FnZSBmcm9tIGEgcGFja2Fn ZSBhcmNoaXZlLCBpdCBtaWdodCBjcmVhdGUKK3NvbWUgZmlsZXMgaW4gYWRkaXRpb24gdG8g dGhlIHBhY2thZ2UncyBjb250ZW50cy4gIElmIHRoZSBwYWNrYWdlCithcmNoaXZlIHByb3Zp ZGVzIGEgbm9uLXRyaXZpYWwgbG9uZyBkZXNjcmlwdGlvbiBmb3Igc29tZSBwYWNrYWdlLCBF bWFjcworc3RvcmVzIGl0IGluIGEgZmlsZSBuYW1lZCBAZmlsZXtSRUFETUUtZWxwYX0gaW4g dGhlIHBhY2thZ2UncyBjb250ZW50CitkaXJlY3RvcnksIHVubGVzcyB0aGUgcGFja2FnZSBp dHNlbGYgcHJvdmlkZXMgc3VjaCBhIGZpbGUuICBJZiBhIHBhY2thZ2UKK2FyY2hpdmUgcHJv dmlkZXMgcGFja2FnZSBzaWduYXR1cmVzLCBFbWFjcyBzdG9yZXMgaW5mb3JtYXRpb24gb24g dGhlCitzaWduYXR1cmVzIGluIGZpbGVzIG5hbWVkIEBmaWxle0B2YXJ7bmFtZX0tQHZhcnt2 ZXJzaW9ufS5zaWduZWR9IGJlbG93CitkaXJlY3RvcnkgQGNvZGV7cGFja2FnZS11c2VyLWRp cn0uCisKIEBjaW5kZXggcGFja2FnZSBhdXRvbG9hZHMKICAgRW1hY3MgdGhlbiBzZWFyY2hl cyBldmVyeSBMaXNwIGZpbGUgaW4gdGhlIGNvbnRlbnQgZGlyZWN0b3J5IGZvcgogYXV0b2xv YWQgbWFnaWMgY29tbWVudHMgKEBweHJlZntBdXRvbG9hZH0pLiAgVGhlc2UgYXV0b2xvYWQK ZGlmZiAtLWdpdCBhL2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLmVsIGIvbGlzcC9lbWFjcy1s aXNwL3BhY2thZ2UuZWwKaW5kZXggYmE5OTk5YzIwZTYuLjk5ODc2NzNkMmFlIDEwMDY0NAot LS0gYS9saXNwL2VtYWNzLWxpc3AvcGFja2FnZS5lbAorKysgYi9saXNwL2VtYWNzLWxpc3Av cGFja2FnZS5lbApAQCAtNTE2LDcgKzUxNiw5IEBAIHBhY2thZ2UtdmMtcAogICAgICAgICBy ZXF1aXJlZCB2ZXJzaW9uLgogCiBga2luZCcJVGhlIGRpc3RyaWJ1dGlvbiBmb3JtYXQgb2Yg dGhlIHBhY2thZ2UuICBDdXJyZW50bHksIGl0IGlzCi0gICAgICAgIGVpdGhlciBgc2luZ2xl JyBvciBgdGFyJy4KKyAgICAgICAgZWl0aGVyIGBzaW5nbGUnLCBgdGFyJywgb3IgKHRlbXBv cmFyaWx5IG9ubHkgYGRpcicpLiBJbgorICAgICAgICBhZGRpdGlvbiwgdGhlcmUgaXMgZGlz dHJpYnV0aW9uIGZvcm1hdCBgdmMnLCB3aGljaCBpcworICAgICAgICBoYW5kbGVkIGJ5IHBh Y2thZ2UtdmMuZWwuCiAKIGBhcmNoaXZlJyBUaGUgbmFtZSBvZiB0aGUgYXJjaGl2ZSAoYXMg YSBzdHJpbmcpIHdoZW5jZSB0aGlzCiAgICAgICAgIHBhY2thZ2UgY2FtZS4KQEAgLTIxNjIs NyArMjE2NCwyMiBAQCBwYWNrYWdlLWluc3RhbGwtZnJvbS1hcmNoaXZlCiAgICAgICAgICAg ICAgICA7OyBVcGRhdGUgdGhlIG5ldyAoYWN0aXZhdGVkKSBwa2ctZGVzYyBhcyB3ZWxsLgog ICAgICAgICAgICAgICAgKHdoZW4tbGV0KiAoKHBrZy1kZXNjcyAoY2RyIChhc3NxIChwYWNr YWdlLWRlc2MtbmFtZSBwa2ctZGVzYykKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBwYWNrYWdlLWFsaXN0KSkpKQotICAgICAgICAgICAgICAg ICAoc2V0ZiAocGFja2FnZS1kZXNjLXNpZ25lZCAoY2FyIHBrZy1kZXNjcykpIHQpKSkpKSkp KSkpCisgICAgICAgICAgICAgICAgIChzZXRmIChwYWNrYWdlLWRlc2Mtc2lnbmVkIChjYXIg cGtnLWRlc2NzKSkgdCkpKSkpKSkpCisgICAgOzsgZmV0Y2ggYSBiYWNrdXAgb2YgdGhlIHJl YWRtZSBmaWxlIGZyb20gdGhlIHNlcnZlci4gIFNsb3QgYGRpcicgaXMKKyAgICA7OyBub3Qg eWV0IGF2YWlsYWJsZSBpbiBQS0ctREVTQywgc28gY29iYmxlIHRoYXQgdXAuCisgICAgKGxl dCogKChkaXJuYW1lIChwYWNrYWdlLWRlc2MtZnVsbC1uYW1lIHBrZy1kZXNjKSkKKyAgICAg ICAgICAgKHBrZy1kaXIgKGV4cGFuZC1maWxlLW5hbWUgZGlybmFtZSBwYWNrYWdlLXVzZXIt ZGlyKSkKKyAgICAgICAgICAgKHJlYWRtZSAoZXhwYW5kLWZpbGUtbmFtZSAiUkVBRE1FLWVs cGEiIHBrZy1kaXIpKSkKKyAgICAgICh1bmxlc3MgKGZpbGUtcmVhZGFibGUtcCByZWFkbWUp CisgICAgICAgIChwYWNrYWdlLS13aXRoLXJlc3BvbnNlLWJ1ZmZlciAocGFja2FnZS1hcmNo aXZlLWJhc2UgcGtnLWRlc2MpCisgICAgICAgICAgOmZpbGUgKGZvcm1hdCAiJXMtcmVhZG1l LnR4dCIgKHBhY2thZ2UtZGVzYy1uYW1lIHBrZy1kZXNjKSkKKyAgICAgICAgICA6bm9lcnJv ciB0CisgICAgICAgICAgOzsgZG8gbm90IHdyaXRlIGVtcHR5IG9yIHdoaXRlc3BhY2Utb25s eSByZWFkbWVzIHRvIGdpdmUKKyAgICAgICAgICA7OyBgcGFja2FnZS0tZ2V0LWRlc2NyaXB0 aW9uJyBhIGNoYW5jZSB0byBmaW5kIGFub3RoZXIgcmVhZG1lCisgICAgICAgICAgKHVubGVz cyAoc2F2ZS1leGN1cnNpb24KKyAgICAgICAgICAgICAgICAgICAgKGdvdG8tY2hhciAocG9p bnQtbWluKSkKKyAgICAgICAgICAgICAgICAgICAgKGxvb2tpbmctYXQtcCAiW1s6c3BhY2U6 XV0qXFwnIikpCisgICAgICAgICAgICAod3JpdGUtcmVnaW9uIG5pbCBuaWwgcmVhZG1lKSkp KSkpKQogCiA7OzsjIyNhdXRvbG9hZAogKGRlZnVuIHBhY2thZ2UtaW5zdGFsbGVkLXAgKHBh Y2thZ2UgJm9wdGlvbmFsIG1pbi12ZXJzaW9uKQpkaWZmIC0tZ2l0IGEvdGVzdC9saXNwL2Vt YWNzLWxpc3AvcGFja2FnZS1yZXNvdXJjZXMvbXVsdGktZmlsZS1yZWFkbWUudHh0IGIvdGVz dC9saXNwL2VtYWNzLWxpc3AvcGFja2FnZS1yZXNvdXJjZXMvbXVsdGktZmlsZS1yZWFkbWUu dHh0CmluZGV4IGFmZmQyZTk2ZmIwLi5kMzU0NzFlYWY5NyAxMDA2NDQKLS0tIGEvdGVzdC9s aXNwL2VtYWNzLWxpc3AvcGFja2FnZS1yZXNvdXJjZXMvbXVsdGktZmlsZS1yZWFkbWUudHh0 CisrKyBiL3Rlc3QvbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UtcmVzb3VyY2VzL211bHRpLWZp bGUtcmVhZG1lLnR4dApAQCAtMSArMSBAQAotVGhpcyBpcyBhIGJhcmUtYm9uZXMgcmVhZG1l IGZpbGUgZm9yIHRoZSBtdWx0aS1maWxlIHBhY2thZ2UuCitUaGlzIGlzIGEgYmFyZS1ib25l cyBzZXJ2ZXIgcmVhZG1lIGZpbGUgZm9yIHRoZSBtdWx0aS1maWxlIHBhY2thZ2UuCmRpZmYg LS1naXQgYS90ZXN0L2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLXJlc291cmNlcy9zaW1wbGUt c2luZ2xlLXJlYWRtZS50eHQgYi90ZXN0L2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLXJlc291 cmNlcy9zaW1wbGUtc2luZ2xlLXJlYWRtZS50eHQKaW5kZXggMjVkMzAzNDAzMmIuLmZhMDY2 MjkzN2Y3IDEwMDY0NAotLS0gYS90ZXN0L2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLXJlc291 cmNlcy9zaW1wbGUtc2luZ2xlLXJlYWRtZS50eHQKKysrIGIvdGVzdC9saXNwL2VtYWNzLWxp c3AvcGFja2FnZS1yZXNvdXJjZXMvc2ltcGxlLXNpbmdsZS1yZWFkbWUudHh0CkBAIC0xLDMg KzEsNCBAQAogVGhpcyBwYWNrYWdlIHByb3ZpZGVzIGEgbWlub3IgbW9kZSB0byBmcm9ibmlj YXRlIGFuZC9vciBiaWZ1cmNhdGUKIGFueSBmbGFuZ2VzIHlvdSBkZXNpcmUuIFRvIGFjdGl2 YXRlIGl0LCB0eXBlICJDLU0tciBNLTMgYnV0dGVyZmx5IgogYW5kIGFsbCB5b3VyIGRyZWFt cyB3aWxsIGNvbWUgdHJ1ZS4KK1RoaXMgaXMgYSBzZXJ2ZXIgcmVhZG1lIGZpbGUuCmRpZmYg LS1naXQgYS90ZXN0L2xpc3AvZW1hY3MtbGlzcC9wYWNrYWdlLXRlc3RzLmVsIGIvdGVzdC9s aXNwL2VtYWNzLWxpc3AvcGFja2FnZS10ZXN0cy5lbAppbmRleCBmMjIwNTE3NzRjOC4uOTVm ZGU2MzRmNzAgMTAwNjQ0Ci0tLSBhL3Rlc3QvbGlzcC9lbWFjcy1saXNwL3BhY2thZ2UtdGVz dHMuZWwKKysrIGIvdGVzdC9saXNwL2VtYWNzLWxpc3AvcGFja2FnZS10ZXN0cy5lbApAQCAt MTEzLDcgKzExMywzMSBAQCB3aXRoLXBhY2thZ2UtdGVzdAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHVwZGF0ZS1uZXdzCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgdXBsb2FkLWJhc2UpCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICZyZXN0IGJvZHkpCi0gICJTZXQgdXAgdGVtcG9yYXJ5IGxv Y2F0aW9ucyBhbmQgdmFyaWFibGVzIGZvciB0ZXN0aW5nLiIKKyAgIlNldCB1cCB0ZW1wb3Jh cnkgbG9jYXRpb25zIGFuZCB2YXJpYWJsZXMgZm9yIHRlc3RpbmcuCitDcmVhdGUgYSB0ZW1w b3JhcnkgYnVmZmVyIGFuZCBleGVjdXRlIEJPRFkgaW4gaXQuCisKK1RoaXMgbWFjcm8gaW50 ZXJwcmV0cyB0aGUgZm9sbG93aW5nIGtleXdvcmRzOgorCis6YmFzZWRpciBCQVNFRElSIC0g Q2hhbmdlIGRpcmVjdG9yeSB0byBCQVNFRElSIGluIHRoZSB0ZW1wb3JhcnkgYnVmZmVyCisg IGJlZm9yZSBleGVjdXRpbmcgQk9EWS4KKyAgWW91IHNob3VsZCB1c2Uga2V5d29yZCA6YmFz ZWRpciBvbmx5IHdoZW4gQk9EWSByZXF1aXJlcyBpdDsgdGhpcyBtYWNybworICBpdHNlbGYg ZG9lcyBub3QgcmVxdWlyZSBpdHMgdXNhZ2UuCisKKzpmaWxlIEZJTEUgLSBFeGVjdXRlIGBp bnNlcnQtZmlsZS1jb250ZW50cycgb24gRklMRSBpbiB0aGUgdGVtcG9yYXJ5IGJ1ZmZlcgor ICBiZWZvcmUgZXhlY3V0aW5nIEJPRFkuCisKKzppbnN0YWxsIFBBQ0tBR0VTIC0gRXhlY3V0 ZSBgcGFja2FnZS1pbnN0YWxsJyBvbiBlYWNoIHBhY2thZ2UgaW4gbGlzdAorICBQQUNLQUdF UyBiZWZvcmUgZXhlY3V0aW5nIEJPRFkuCisKKzpsb2NhdGlvbiBBUkNISVZFLURJUiAtIFVz ZSBkaXJlY3RvcnkgQVJDSElWRS1ESVIgYXMgcGFja2FnZSBhcmNoaXZlCisgIGRpcmVjdG9y eSBpbnN0ZWFkIG9mIGBwYWNrYWdlLXRlc3QtdXNlci1kaXInLgorCis6dXBkYXRlLW5ld3Mg VVBEQVRFLU5FV1MgLSBJZiBVUERBVEUtTkVXUyBpcyBub24tbmlsLCBiaW5kCisgIGBwYWNr YWdlLXVwZGF0ZS1uZXdzLW9uLXVwbG9hZCcgdG8gdCB3aGlsZSBleGVjdXRpbmcgQk9EWS4K KworOnVwbG9hZC1iYXNlIFVQREFURS1CQVNFIC0gSWYgVVBEQVRFLUJBU0UgaXMgbm9uLW5p bCwgY3JlYXRlIGEgdGVtcG9yYXJ5CisgIGRpcmVjdG9yeSwgYmluZCBgcGFja2FnZS1hcmNo aXZlLXVwbG9hZC1iYXNlJyB0byB0aGUgbG9jYXRpb24gb2YgdGhhdAorICB3aGlsZSBleGVj dXRpbmcgQk9EWSwgYW5kIGNsZWFuIGl0IHVwIGFmdGVyIHRoYXQuIgogICAoZGVjbGFyZSAo aW5kZW50IDEpIChkZWJ1ZyAoKFsmcmVzdCBmb3JtXSkgYm9keSkpKQogICBgKGVydC13aXRo LXRlbXAtZGlyZWN0b3J5IHBhY2thZ2UtdGVzdC11c2VyLWRpcgogICAgICAobGV0KiAoKHBy b2Nlc3MtZW52aXJvbm1lbnQgKGNvbnMgKGZvcm1hdCAiSE9NRT0lcyIgcGFja2FnZS10ZXN0 LXVzZXItZGlyKQpAQCAtMTM4LDcgKzE2Miw2IEBAIHdpdGgtcGFja2FnZS10ZXN0CiAgICAg ICAgICAgIChraWxsLWJ1ZmZlciBidWYpKSkKICAgICAgICAodW53aW5kLXByb3RlY3QKICAg ICAgICAgICAgKHByb2duCi0gICAgICAgICAgICAgLChpZiBiYXNlZGlyIGAoY2QgLGJhc2Vk aXIpKQogICAgICAgICAgICAgICh1bmxlc3MgKGZpbGUtZGlyZWN0b3J5LXAgcGFja2FnZS11 c2VyLWRpcikKICAgICAgICAgICAgICAgIChta2RpciBwYWNrYWdlLXVzZXItZGlyKSkKICAg ICAgICAgICAgICAoY2wtbGV0ZiAoKChzeW1ib2wtZnVuY3Rpb24gJ3llcy1vci1uby1wKSAo bGFtYmRhICgmcmVzdCBfKSB0KSkKQEAgLTE0OCw2ICsxNzEsNyBAQCB3aXRoLXBhY2thZ2Ut dGVzdAogICAgICAgICAgICAgICAgICAgICAgKHBhY2thZ2UtcmVmcmVzaC1jb250ZW50cykK ICAgICAgICAgICAgICAgICAgICAgIChtYXBjICdwYWNrYWdlLWluc3RhbGwgLGluc3RhbGwp KSkKICAgICAgICAgICAgICAgICh3aXRoLXRlbXAtYnVmZmVyCisgICAgICAgICAgICAgICAg ICwoaWYgYmFzZWRpciBgKGNkICxiYXNlZGlyKSkKICAgICAgICAgICAgICAgICAgLChpZiBm aWxlCiAgICAgICAgICAgICAgICAgICAgICAgYChpbnNlcnQtZmlsZS1jb250ZW50cyAsZmls ZSkpCiAgICAgICAgICAgICAgICAgICxAYm9keSkpKQpAQCAtMTYwLDExICsxODQsNyBAQCB3 aXRoLXBhY2thZ2UtdGVzdAogICAgICAgICAgICAgIChpZ25vcmUtZXJyb3JzCiAgICAgICAg ICAgICAgICAoZGVsZXRlLWZpbGUKICAgICAgICAgICAgICAgICAoZXhwYW5kLWZpbGUtbmFt ZSBmIHBhY2thZ2UtdGVzdC1hcmNoaXZlLXVwbG9hZC1iYXNlKSkpKQotICAgICAgICAgICAo ZGVsZXRlLWRpcmVjdG9yeSBwYWNrYWdlLXRlc3QtYXJjaGl2ZS11cGxvYWQtYmFzZSkpCi0K LSAgICAgICAgICh3aGVuIChhbmQgKGJvdW5kcCAncGFja2FnZS10ZXN0LWFyY2hpdmUtdXBs b2FkLWJhc2UpCi0gICAgICAgICAgICAgICAgICAgIChmaWxlLWRpcmVjdG9yeS1wIHBhY2th Z2UtdGVzdC1hcmNoaXZlLXVwbG9hZC1iYXNlKSkKLSAgICAgICAgICAgKGRlbGV0ZS1kaXJl Y3RvcnkgcGFja2FnZS10ZXN0LWFyY2hpdmUtdXBsb2FkLWJhc2UgdCkpKSkpKQorICAgICAg ICAgICAoZGVsZXRlLWRpcmVjdG9yeSBwYWNrYWdlLXRlc3QtYXJjaGl2ZS11cGxvYWQtYmFz ZSkpKSkpKQogCiAoZGVmbWFjcm8gd2l0aC1mYWtlLWhlbHAtYnVmZmVyICgmcmVzdCBib2R5 KQogICAiRXhlY3V0ZSBCT0RZIGluIGEgdGVtcCBidWZmZXIgd2hpY2ggaXMgdHJlYXRlZCBh cyB0aGUgXCIqSGVscCpcIiBidWZmZXIuIgpAQCAtMjY5LDcgKzI4OSw3IEBAIHBhY2thZ2Ut dGVzdC1pbnN0YWxsLXNpbmdsZQogCiAoZXJ0LWRlZnRlc3QgcGFja2FnZS10ZXN0LWluc3Rh bGwtZmlsZSAoKQogICAiSW5zdGFsbCBmaWxlcyB3aXRoIGBwYWNrYWdlLWluc3RhbGwtZmls ZScuIgotICAod2l0aC1wYWNrYWdlLXRlc3QgKDpiYXNlZGlyIChlcnQtcmVzb3VyY2UtZGly ZWN0b3J5KSkKKyAgKHdpdGgtcGFja2FnZS10ZXN0ICgpCiAgICAgKHBhY2thZ2UtaW5pdGlh bGl6ZSkKICAgICAobGV0KiAoKHBrZy1lbCAic2ltcGxlLXNpbmdsZS0xLjMuZWwiKQogICAg ICAgICAgICAoc291cmNlLWZpbGUgKGV4cGFuZC1maWxlLW5hbWUgcGtnLWVsIChlcnQtcmVz b3VyY2UtZGlyZWN0b3J5KSkpKQpAQCAtMjgxLDE0ICszMDEsMTQgQEAgcGFja2FnZS10ZXN0 LWluc3RhbGwtZmlsZQogCiAgICAgKGxldCogKChwa2ctZWwgIm11bHRpLWZpbGUtMC4yLjMu dGFyIikKICAgICAgICAgICAgKHNvdXJjZS1maWxlIChleHBhbmQtZmlsZS1uYW1lIHBrZy1l bCAoZXJ0LXJlc291cmNlLWRpcmVjdG9yeSkpKSkKLSAgICAgIChzaG91bGQtbm90IChwYWNr YWdlLWluc3RhbGxlZC1wICdtdWx0aWUtZmlsZSkpCisgICAgICAoc2hvdWxkLW5vdCAocGFj a2FnZS1pbnN0YWxsZWQtcCAnbXVsdGktZmlsZSkpCiAgICAgICAocGFja2FnZS1pbnN0YWxs LWZpbGUgc291cmNlLWZpbGUpCiAgICAgICAoc2hvdWxkIChwYWNrYWdlLWluc3RhbGxlZC1w ICdtdWx0aS1maWxlKSkKICAgICAgIChwYWNrYWdlLWRlbGV0ZSAoY2FkciAoYXNzcSAnbXVs dGktZmlsZSBwYWNrYWdlLWFsaXN0KSkpKSkpCiAKIChlcnQtZGVmdGVzdCBwYWNrYWdlLXRl c3QtYnVnNTgzNjcgKCkKICAgIkNoZWNrIHZhcmlhdGlvbnMgaW4gdGFyYmFsbCBmb3JtYXRz LiIKLSAgKHdpdGgtcGFja2FnZS10ZXN0ICg6YmFzZWRpciAoZXJ0LXJlc291cmNlLWRpcmVj dG9yeSkpCisgICh3aXRoLXBhY2thZ2UtdGVzdCAoKQogICAgIChwYWNrYWdlLWluaXRpYWxp emUpCiAKICAgICA7OyBBIHBhY2thZ2Ugd2hvc2UgZmlyc3QgZW50cnkgaXMgdGhlIG1haW4g ZGlyIGJ1dCB3aXRob3V0IHRyYWlsaW5nIC8uCkBAIC0zMTAsNyArMzMwLDcgQEAgcGFja2Fn ZS10ZXN0LWJ1ZzU4MzY3CiAKIChlcnQtZGVmdGVzdCBwYWNrYWdlLXRlc3QtYnVnNjU0NzUg KCkKICAgIkRlbGV0aW5nIHRoZSBsYXN0IHBhY2thZ2UgY2xlYXJzIGBwYWNrYWdlLXNlbGVj dGVkLXBhY2thZ2VzJy4iCi0gICh3aXRoLXBhY2thZ2UtdGVzdCAoOmJhc2VkaXIgKGVydC1y ZXNvdXJjZS1kaXJlY3RvcnkpKQorICAod2l0aC1wYWNrYWdlLXRlc3QgKCkKICAgICAocGFj a2FnZS1pbml0aWFsaXplKQogICAgIChsZXQqICgocGtnLWVsICJzaW1wbGUtc2luZ2xlLTEu My5lbCIpCiAgICAgICAgICAgIChzb3VyY2UtZmlsZSAoZXhwYW5kLWZpbGUtbmFtZSBwa2ct ZWwgKGVydC1yZXNvdXJjZS1kaXJlY3RvcnkpKSkpCkBAIC0zMjYsNyArMzQ2LDcgQEAgcGFj a2FnZS10ZXN0LWJ1ZzY1NDc1CiAoZXJ0LWRlZnRlc3QgcGFja2FnZS10ZXN0LWluc3RhbGwt ZmlsZS1FT0xzICgpCiAgICJJbnN0YWxsIHNhbWUgZmlsZSBtdWx0aXBsZSB0aW1lIHdpdGgg YHBhY2thZ2UtaW5zdGFsbC1maWxlJwogYnV0IHdpdGggYSBkaWZmZXJlbnQgZW5kIG9mIGxp bmUgY29udmVudGlvbiAoYnVnIzQ4MTM3KS4iCi0gICh3aXRoLXBhY2thZ2UtdGVzdCAoOmJh c2VkaXIgKGVydC1yZXNvdXJjZS1kaXJlY3RvcnkpKQorICAod2l0aC1wYWNrYWdlLXRlc3Qg KCkKICAgICAocGFja2FnZS1pbml0aWFsaXplKQogICAgIChsZXQqICgocGtnLWVsICJzaW1w bGUtc2luZ2xlLTEuMy5lbCIpCiAgICAgICAgICAgIChzb3VyY2UtZmlsZSAoZXhwYW5kLWZp bGUtbmFtZSBwa2ctZWwgKGVydC1yZXNvdXJjZS1kaXJlY3RvcnkpKSkpCkBAIC00NjYsMTYg KzQ4Niw0OCBAQCBwYWNrYWdlLXRlc3QtaW5zdGFsbC1wcmlvcml0aXplZAogICAgICAgICAo c2hvdWxkICh2ZXJzaW9uLWxpc3QtPSAnKDEgMykKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgKHBhY2thZ2UtZGVzYy12ZXJzaW9uIGluc3RhbGxlZCkpKSkpKSkKIAorKGVy dC1kZWZ0ZXN0IHBhY2thZ2UtdGVzdC1pbnN0YWxsLXNpbmdsZWZpbGUgKCkKKyAgIkNoZWNr IHByb3BlcnRpZXMgb2YgdGhlIGluc3RhbGxlZCBzaW5nbGUtZmlsZSBwYWNrYWdlLiIKKyAg KHdpdGgtcGFja2FnZS10ZXN0ICg6aW5zdGFsbCAnKHNpbXBsZS1zaW5nbGUpKQorICAgIChs ZXQgKChhdXRvbG9hZC1maWxlCisgICAgICAgICAgIChleHBhbmQtZmlsZS1uYW1lICJzaW1w bGUtc2luZ2xlLWF1dG9sb2Fkcy5lbCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KGV4cGFuZC1maWxlLW5hbWUKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJzaW1w bGUtc2luZ2xlLTEuMyIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhY2thZ2Ut dGVzdC11c2VyLWRpcikpKQorICAgICAgICAgIChpbnN0YWxsZWQtZmlsZXMgJygiUkVBRE1F LWVscGEiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJzaW1wbGUtc2luZ2xlLWF1 dG9sb2Fkcy5lbCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInNpbXBsZS1zaW5n bGUtcGtnLmVsIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAic2ltcGxlLXNpbmds ZS5lbGMiKSkKKyAgICAgICAgICAoYXV0b2xvYWQtZm9ybXMgJygiXihhdXRvbG9hZCAnc2lt cGxlLXNpbmdsZS1tb2RlIikpCisgICAgICAgICAgKHBrZy1kaXIgKGZpbGUtbmFtZS1hcy1k aXJlY3RvcnkKKyAgICAgICAgICAgICAgICAgICAgKGV4cGFuZC1maWxlLW5hbWUKKyAgICAg ICAgICAgICAgICAgICAgICJzaW1wbGUtc2luZ2xlLTEuMyIKKyAgICAgICAgICAgICAgICAg ICAgIHBhY2thZ2UtdGVzdC11c2VyLWRpcikpKSkKKyAgICAgIChwYWNrYWdlLXJlZnJlc2gt Y29udGVudHMpCisgICAgICAoc2hvdWxkIChwYWNrYWdlLWluc3RhbGxlZC1wICdzaW1wbGUt c2luZ2xlKSkKKyAgICAgICh3aXRoLXRlbXAtYnVmZmVyCisgICAgICAgIChkb2xpc3QgKGZu IGluc3RhbGxlZC1maWxlcykKKyAgICAgICAgICAoc2hvdWxkIChmaWxlLWV4aXN0cy1wIChl eHBhbmQtZmlsZS1uYW1lIGZuIHBrZy1kaXIpKSkpCisgICAgICAgIChpbnNlcnQtZmlsZS1j b250ZW50cy1saXRlcmFsbHkgYXV0b2xvYWQtZmlsZSkKKyAgICAgICAgKGRvbGlzdCAocmUg YXV0b2xvYWQtZm9ybXMpCisgICAgICAgICAgKGdvdG8tY2hhciAocG9pbnQtbWluKSkKKyAg ICAgICAgICAoc2hvdWxkIChyZS1zZWFyY2gtZm9yd2FyZCByZSBuaWwgdCkpKSkpKSkKKwog KGVydC1kZWZ0ZXN0IHBhY2thZ2UtdGVzdC1pbnN0YWxsLW11bHRpZmlsZSAoKQogICAiQ2hl Y2sgcHJvcGVydGllcyBvZiB0aGUgaW5zdGFsbGVkIG11bHRpLWZpbGUgcGFja2FnZS4iCi0g ICh3aXRoLXBhY2thZ2UtdGVzdCAoOmJhc2VkaXIgKGVydC1yZXNvdXJjZS1kaXJlY3Rvcnkp IDppbnN0YWxsICcobXVsdGktZmlsZSkpCisgICh3aXRoLXBhY2thZ2UtdGVzdCAoOmluc3Rh bGwgJyhtdWx0aS1maWxlKSkKICAgICAobGV0ICgoYXV0b2xvYWQtZmlsZQogICAgICAgICAg ICAoZXhwYW5kLWZpbGUtbmFtZSAibXVsdGktZmlsZS1hdXRvbG9hZHMuZWwiCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIChleHBhbmQtZmlsZS1uYW1lCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAibXVsdGktZmlsZS0wLjIuMyIKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHBhY2thZ2UtdGVzdC11c2VyLWRpcikpKQotICAgICAgICAgIChpbnN0 YWxsZWQtZmlsZXMgJygiZGlyIiAibXVsdGktZmlsZS5pbmZvIiAibXVsdGktZmlsZS1zdWIu ZWxjIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAibXVsdGktZmlsZS1hdXRvbG9h ZHMuZWwiICJtdWx0aS1maWxlLmVsYyIpKQorICAgICAgICAgIChpbnN0YWxsZWQtZmlsZXMg Jyg7OyBhbHJlYWR5IHByZXNlbnQgaW4gdGFyCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJSRUFETUUiICJkaXIiICJtdWx0aS1maWxlLmluZm8iCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIDs7IGdlbmVyYXRlZCBkdXJpbmcgaW5zdGFsbGF0aW9uCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICJSRUFETUUtZWxwYSIKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIm11bHRpLWZpbGUtYXV0b2xvYWRzLmVsIgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAibXVsdGktZmlsZS1zdWIuZWxjIgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAibXVsdGktZmlsZS5lbGMiKSkKICAgICAgICAgICAoYXV0b2xvYWQtZm9y bXMgJygiXihkZWZ2YXIgbXVsdGktZmlsZS1jdXN0b20tdmFyIgogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICJeKGN1c3RvbS1hdXRvbG9hZCAnbXVsdGktZmlsZS1jdXN0b20tdmFy IgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICJeKGF1dG9sb2FkICdtdWx0aS1maWxl LW1vZGUiKSkKQEAgLTY5NSw2ICs3NDcsMTcgQEAgcGFja2FnZS10ZXN0LXBhY2thZ2UtaW5z dGFsbGVkLXAKICAgICAoc2hvdWxkIChwYWNrYWdlLWluc3RhbGxlZC1wICdwcm9qZWN0IG5p bCkpCiAgICAgKHNob3VsZCAobm90IChwYWNrYWdlLWluc3RhbGxlZC1wICdpbWFnaW5hcnkt cGFja2FnZSBuaWwpKSkpKQogCis7OyBUaGUgbG9uZyBkZXNjcmlwdGlvbiBvZiBpbnN0YWxs ZWQgcGFja2FnZXMgc2hvdWxkIHByaW1hcmlseSBjb21lIGZyb20KKzs7IHRoZSBwYWNrYWdl IGFyY2hpdmUgdGhyb3VnaCBmaWxlICotcmVhZG1lLnR4dCBzdG9yZWQgaW4gUkVBRE1FLWVs cGEsCis7OyBhbmQgbm90IGZyb20gYW55IFJFQURNRSAob3IgY29tbWVudGFyeSkgb2YgdGhl IHBhY2thZ2UgaXRzZWxmLiAgU28KKzs7IGJlbG93IHdlIGludGVudGlvbmFsbHkgdGVzdCBm b3IgdGhlIGNvbnRlbnRzIG9mIGZpbGVzICotcmVhZG1lLnR4dAorOzsgKCIqc2VydmVyKiBy ZWFkbWUiKSwgd2hpY2ggZGlmZmVycyBmcm9tIHdoYXQgdGhlIHNpbXBsZS1zaW5nbGUtMS4z LmVsCis7OyBvciBtdWx0aS1maWxlLTAuMi4zLnRhci9SRUFETUUgY29udGFpbi4KKzs7Cis7 OyBJZiB0aGUgcGFja2FnZSBhcmNoaXZlIHByb3ZpZGVzIGEgd2hpdGVzcGFjZS1vbmx5IGZp bGUgKi1yZWFkbWUudHh0LAorOzsgdGhlbiB0aGF0IHNob3VsZCAqbm90KiBiZSB1c2VkIGFz IFJFQURNRS1lbHBhLCBzbyB0aGF0Cis7OyBgZGVzY3JpYmUtcGFja2FnZScgdHJpZXMgdG8g Y29tZSB1cCB3aXRoIHNvbWV0aGluZyByZWFzb25hYmxlIGl0c2VsZi4KKwogKGVydC1kZWZ0 ZXN0IHBhY2thZ2UtdGVzdC1kZXNjcmliZS1wYWNrYWdlICgpCiAgICJUZXN0IGRpc3BsYXlp bmcgaGVscCBmb3IgYSBwYWNrYWdlLiIKIApAQCAtNzI1LDggKzc4OCwzMyBAQCBwYWNrYWdl LXRlc3QtZGVzY3JpYmUtcGFja2FnZQogICAgICAoc2F2ZS1leGN1cnNpb24gKHNob3VsZCAo cmUtc2VhcmNoLWZvcndhcmQgIktleXdvcmRzOiBcXFs/ZnJvYm5pY2F0ZVxcXT8iIG5pbCB0 KSkpCiAgICAgIChzYXZlLWV4Y3Vyc2lvbiAoc2hvdWxkIChzZWFyY2gtZm9yd2FyZCAiVGhp cyBwYWNrYWdlIHByb3ZpZGVzIGEgbWlub3IgbW9kZSB0byBmcm9ibmljYXRlIgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmlsIHQpKSkKKyAgICAg KHNhdmUtZXhjdXJzaW9uIChzaG91bGQgKHNlYXJjaC1mb3J3YXJkICJUaGlzIGlzIGEgc2Vy dmVyIHJlYWRtZSBmaWxlLiIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG5pbCB0KSkpCiAgICAgICkpKQogCisoZXJ0LWRlZnRlc3QgcGFja2FnZS10 ZXN0LWRlc2NyaWJlLWluc3RhbGxlZC13aXRoLXdzLW9ubHktcmVhZG1lICgpCisgICJUZXN0 IGRpc3BsYXlpbmcgb2YgdGhlIHJlYWRtZSBmb3IgaW5zdGFsbGVkIHBhY2thZ2Ugd2l0aCB3 cy1vbmx5IHJlYWRtZS4iCisKKyAgKGVydC13aXRoLXRlbXAtZGlyZWN0b3J5IHRlbXAtYXJj aGl2ZQorICAgIChjb3B5LWZpbGUgKGVydC1yZXNvdXJjZS1maWxlICJhcmNoaXZlLWNvbnRl bnRzIikgdGVtcC1hcmNoaXZlKQorICAgIChjb3B5LWZpbGUgKGVydC1yZXNvdXJjZS1maWxl ICJzaW1wbGUtc2luZ2xlLTEuMy5lbCIpIHRlbXAtYXJjaGl2ZSkKKyAgICAod2l0aC10ZW1w LWJ1ZmZlcgorICAgICAgKGluc2VydCAiIFx0XG5cdCBcbiIpCisgICAgICAod3JpdGUtcmVn aW9uIG5pbCBuaWwgKGV4cGFuZC1maWxlLW5hbWUgInNpbXBsZS1zaW5nbGUtcmVhZG1lLnR4 dCIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0ZW1w LWFyY2hpdmUpKSkKKyAgICAod2l0aC1wYWNrYWdlLXRlc3QgKDpsb2NhdGlvbiB0ZW1wLWFy Y2hpdmUpCisgICAgICAocGFja2FnZS1pbml0aWFsaXplKQorICAgICAgKHBhY2thZ2UtcmVm cmVzaC1jb250ZW50cykKKyAgICAgIChwYWNrYWdlLWluc3RhbGwgJ3NpbXBsZS1zaW5nbGUp CisgICAgICAod2l0aC1mYWtlLWhlbHAtYnVmZmVyCisgICAgICAgKGRlc2NyaWJlLXBhY2th Z2UgJ3NpbXBsZS1zaW5nbGUpCisgICAgICAgKGdvdG8tY2hhciAocG9pbnQtbWluKSkKKyAg ICAgICAoc2hvdWxkIChzZWFyY2gtZm9yd2FyZCAiUGFja2FnZSBzaW1wbGUtc2luZ2xlIGlz IGluc3RhbGxlZC4iIG5pbCB0KSkKKyAgICAgICAoc2F2ZS1leGN1cnNpb24gKHNob3VsZCAo c2VhcmNoLWZvcndhcmQgIlRoaXMgcGFja2FnZSBwcm92aWRlcyBhIG1pbm9yIG1vZGUgdG8g ZnJvYm5pY2F0ZSIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbmlsIHQpKSkKKyAgICAgICAoc2F2ZS1leGN1cnNpb24gKHNob3VsZC1ub3QgKHNl YXJjaC1mb3J3YXJkICJUaGlzIGlzIGEgc2VydmVyIHJlYWRtZSBmaWxlLiIKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5pbCB0KSkpKSkp KQorCiAoZXJ0LWRlZnRlc3QgcGFja2FnZS10ZXN0LWRlc2NyaWJlLWluc3RhbGxlZC1tdWx0 aS1maWxlLXBhY2thZ2UgKCkKICAgIlRlc3QgZGlzcGxheWluZyBvZiB0aGUgcmVhZG1lIGZv ciBpbnN0YWxsZWQgbXVsdGktZmlsZSBwYWNrYWdlLiIKIApAQCAtNzM4LDcgKzgyNiw3IEBA IHBhY2thZ2UtdGVzdC1kZXNjcmliZS1pbnN0YWxsZWQtbXVsdGktZmlsZS1wYWNrYWdlCiAg ICAgIChkZXNjcmliZS1wYWNrYWdlICdtdWx0aS1maWxlKQogICAgICAoZ290by1jaGFyIChw b2ludC1taW4pKQogICAgICAoc2hvdWxkIChzZWFyY2gtZm9yd2FyZCAiV2Vic2l0ZTogaHR0 cDovL3B1ZGRsZXMubGkiIG5pbCB0KSkKLSAgICAgKHNob3VsZCAoc2VhcmNoLWZvcndhcmQg IlRoaXMgaXMgYSBiYXJlLWJvbmVzIHJlYWRtZSBmaWxlIGZvciB0aGUgbXVsdGktZmlsZSIK KyAgICAgKHNob3VsZCAoc2VhcmNoLWZvcndhcmQgIlRoaXMgaXMgYSBiYXJlLWJvbmVzIHNl cnZlciByZWFkbWUgZmlsZSBmb3IgdGhlIG11bHRpLWZpbGUiCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG5pbCB0KSkpKSkKIAogKGVydC1kZWZ0ZXN0IHBhY2thZ2UtdGVzdC1k ZXNjcmliZS1ub24taW5zdGFsbGVkLXBhY2thZ2UgKCkKQEAgLTc1Miw2ICs4NDAsOCBAQCBw YWNrYWdlLXRlc3QtZGVzY3JpYmUtbm9uLWluc3RhbGxlZC1wYWNrYWdlCiAgICAgIChnb3Rv LWNoYXIgKHBvaW50LW1pbikpCiAgICAgIChzaG91bGQgKHNlYXJjaC1mb3J3YXJkICJXZWJz aXRlOiBodHRwOi8vZG9vZGxlcy5hdSIgbmlsIHQpKQogICAgICAoc2hvdWxkIChzZWFyY2gt Zm9yd2FyZCAiVGhpcyBwYWNrYWdlIHByb3ZpZGVzIGEgbWlub3IgbW9kZSB0byBmcm9ibmlj YXRlIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICBuaWwgdCkpCisgICAgIChzaG91 bGQgKHNlYXJjaC1mb3J3YXJkICJUaGlzIGlzIGEgc2VydmVyIHJlYWRtZSBmaWxlLiIKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbmlsIHQpKSkpKQogCiAoZXJ0LWRlZnRlc3Qg cGFja2FnZS10ZXN0LWRlc2NyaWJlLW5vbi1pbnN0YWxsZWQtbXVsdGktZmlsZS1wYWNrYWdl ICgpCkBAIC03NjQsNyArODU0LDcgQEAgcGFja2FnZS10ZXN0LWRlc2NyaWJlLW5vbi1pbnN0 YWxsZWQtbXVsdGktZmlsZS1wYWNrYWdlCiAgICAgIChkZXNjcmliZS1wYWNrYWdlICdtdWx0 aS1maWxlKQogICAgICAoZ290by1jaGFyIChwb2ludC1taW4pKQogICAgICAoc2hvdWxkIChz ZWFyY2gtZm9yd2FyZCAiV2Vic2l0ZTogaHR0cDovL3B1ZGRsZXMubGkiIG5pbCB0KSkKLSAg ICAgKHNob3VsZCAoc2VhcmNoLWZvcndhcmQgIlRoaXMgaXMgYSBiYXJlLWJvbmVzIHJlYWRt ZSBmaWxlIGZvciB0aGUgbXVsdGktZmlsZSIKKyAgICAgKHNob3VsZCAoc2VhcmNoLWZvcndh cmQgIlRoaXMgaXMgYSBiYXJlLWJvbmVzIHNlcnZlciByZWFkbWUgZmlsZSBmb3IgdGhlIG11 bHRpLWZpbGUiCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5pbCB0KSkpKSkKIAog KGRlZnZhciBlcGctY29uZmlnLS1wcm9ncmFtLWFsaXN0KSA7IFNpbGVuY2UgYnl0ZS1jb21w aWxlci4KLS0gCjIuMzkuNQoK --------------LLha6oxRMC0oJOmXwHyXJfob--
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.
Received: (at 79411) by debbugs.gnu.org; 13 Sep 2025 10:39:47 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 13 06:39:47 2025
Received: from localhost ([127.0.0.1]:53861 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uxNfW-0000dg-9l
for submit <at> debbugs.gnu.org; Sat, 13 Sep 2025 06:39:46 -0400
Received: from mout01.posteo.de ([185.67.36.65]:36181)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <philipk@HIDDEN>)
id 1uxNfT-0000cq-FA
for 79411 <at> debbugs.gnu.org; Sat, 13 Sep 2025 06:39:44 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout01.posteo.de (Postfix) with ESMTPS id B45D2240027
for <79411 <at> debbugs.gnu.org>; Sat, 13 Sep 2025 12:39:36 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=posteo.net; s=2017;
t=1757759976; bh=EBWbDE8L6rts09oYfmH/80e4zbeNETI3MI+kNHU+Xlk=;
h=From:To:Cc:Subject:OpenPGP:Date:Message-ID:MIME-Version:
Content-Type:From;
b=gxQEQar7cccbeZA1DSkEGksG7SJC6LJxi9ilR4+mcdz3S0C9pvTZdd/ke9QMHN7c7
sFSuGn48cC2J9cDIr+NEJ5a5uqjIYGd7x/4ge0bB0exgeZr+LdARaH46z9/8vJMibD
gGYx0VpTKlijjaWn6/SrCC/3QeRCLeLbPUCLtCSZdGu40h1IQNnmeDBnBYp1DZ9pR1
R3+OzUe51gxFnQGfyBRchB8CN+j1Qaip4+X8OWxFHv/2uY3NMZilPeZ7NWgRFCUlAG
01eqLIxkX+UZA66I6h4AOqvgnV4YLo4qNtUklWFQHhmixseZFokrPcbXFvBv/xXgUL
7vKMKzUZLdwjQ==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4cP78R6LSNz6tsb;
Sat, 13 Sep 2025 12:39:35 +0200 (CEST)
From: Philip Kaludercic <philipk@HIDDEN>
To: Jens Schmidt <jschmidt4gnu@HIDDEN>
Subject: Re: bug#79411: 31.0.50; describe-package does not show :readme
after package installation, but sth else
In-Reply-To: <8d75da04-15d7-4c40-bb09-912b02aee492@HIDDEN>
References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN>
<8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN>
<796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN>
<871pocr7ot.fsf@HIDDEN> <86wm648utt.fsf@HIDDEN>
<87wm64owhk.fsf@HIDDEN>
<8d75da04-15d7-4c40-bb09-912b02aee492@HIDDEN>
OpenPGP: id=7126E1DE2F0CE35C770BED01F2C3CC513DB89F66;
url="https://keys.openpgp.org/vks/v1/by-fingerprint/7126E1DE2F0CE35C770BED01F2C3CC513DB89F66";
preference=signencrypt
Date: Sat, 13 Sep 2025 10:39:36 +0000
Message-ID: <877by2y6u0.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 79411
Cc: Stephen Leake <stephen_leake@HIDDEN>, 79411 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
--=-=-=
Content-Type: text/plain
Jens Schmidt <jschmidt4gnu@HIDDEN> writes:
> On 2025-09-12 11:23, Philip Kaludercic wrote:
>
>> In my previous message I suggested something like:
>>
>> diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
>> index ba9999c20e6..b9e2eb96389 100644
>> --- a/lisp/emacs-lisp/package.el
>> +++ b/lisp/emacs-lisp/package.el
>> @@ -2162,7 +2162,15 @@ package-install-from-archive
>> ;; Update the new (activated) pkg-desc as well.
>> (when-let* ((pkg-descs (cdr (assq (package-desc-name pkg-desc)
>> package-alist))))
>> - (setf (package-desc-signed (car pkg-descs)) t))))))))))
>> + (setf (package-desc-signed (car pkg-descs)) t)))))))
>> + ;; fetch a backup of the readme file from the server
>> + (let ((readme (expand-file-name "README-elpa" (package-desc-dir pkg-desc))))
>> + (unless (file-readable-p readme)
>> + (package--with-response-buffer (package-archive-base pkg-desc)
>> + :file (format "%s-readme.txt" (package-desc-name pkg-desc))
>> + :noerror t
>> + (write-region nil nil readme)))))))
>> +
>>
>> ;;;###autoload
>> (defun package-installed-p (package &optional min-version)
>>
>> As we store the README file inside the package directory, it should also
>> be deleted when we delete the package -- unless I am missing something?
>
> I like that approach, it should fix this issue, and it nicely
> complements what elpa-admin.el already does for some readmes on server
> side. Some notes:
>
> 1. You probably should not write README-elpa when it would be empty
> (which can happen, see
> https://elpa.gnu.org/packages/bicep-ts-mode-readme.txt), as that
> would block the search of `package--get-description' for more
> readmes.
>
> 2. Alternatively or in addition, one could extend
> `package--get-description' to not consider empty files in its
> search for a readme.
I think the former is preferable. My suggestion would be as follows:
--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index ba9999c20e6..0885f1a5a35 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2162,7 +2162,18 @@ package-install-from-archive
;; Update the new (activated) pkg-desc as well.
(when-let* ((pkg-descs (cdr (assq (package-desc-name pkg-desc)
package-alist))))
- (setf (package-desc-signed (car pkg-descs)) t))))))))))
+ (setf (package-desc-signed (car pkg-descs)) t)))))))
+ ;; fetch a backup of the readme file from the server
+ (let ((readme (expand-file-name "README-elpa" (package-desc-dir pkg-desc))))
+ (unless (file-readable-p readme)
+ (package--with-response-buffer (package-archive-base pkg-desc)
+ :file (format "%s-readme.txt" (package-desc-name pkg-desc))
+ :noerror t
+ (unless (save-excursion
+ (goto-char (point-min))
+ (looking-at-p "\\`[[:space:]]*\\'"))
+ (write-region nil nil readme))))))))
+
;;;###autoload
(defun package-installed-p (package &optional min-version)
--=-=-=
Content-Type: text/plain
> 3. I think a paragraph in "(elisp) Packaging Basics" and some tests in
> package-tests.el would still be required. Do you want me to supply
> these?
That would be great!
> Thanks!
--=-=-=--
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.Received: (at 79411) by debbugs.gnu.org; 13 Sep 2025 10:04:36 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Sep 13 06:04:36 2025 Received: from localhost ([127.0.0.1]:53677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uxN7T-0006CZ-KC for submit <at> debbugs.gnu.org; Sat, 13 Sep 2025 06:04:35 -0400 Received: from mr3.vodafonemail.de ([145.253.228.163]:35698) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <jschmidt4gnu@HIDDEN>) id 1uxN7Q-0006Bx-Ar for 79411 <at> debbugs.gnu.org; Sat, 13 Sep 2025 06:04:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vodafonemail.de; s=vfde-mb-mr2-23sep; t=1757757864; bh=g/Q94gXZXiIotYwflrgoBFkTh4+b/JAS6xFOwvyC87A=; h=Message-ID:Date:User-Agent:Subject:To:References:From: Content-Language:In-Reply-To:Content-Type:From; b=gJ/ZHX7W2oxSoGrqI0a21ZRPvcJN/7HbhKECJliAJrkZP8CLvCQMC9exV4AZzTbjz EiBrmN2f6dP6yPrG81CmdFMmEWu1TACKaHVtcK6kAAIaDgynn/gXFyjp3k5XsB8c88 5PffmYeV0ndeLl1KFh29izsE03l6i+NkRTqBA+lE= Received: from smtp.vodafone.de (unknown [10.0.0.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by mr3.vodafonemail.de (Postfix) with ESMTPS id 4cP6Mr1qdpz2GSD; Sat, 13 Sep 2025 10:04:24 +0000 (UTC) Received: from [192.168.178.42] (port-92-199-128-239.dynamic.as20676.net [92.199.128.239]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.vodafone.de (Postfix) with ESMTPSA id 4cP6Md3jNcz92kT; Sat, 13 Sep 2025 10:04:10 +0000 (UTC) Message-ID: <8d75da04-15d7-4c40-bb09-912b02aee492@HIDDEN> Date: Sat, 13 Sep 2025 12:04:04 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#79411: 31.0.50; describe-package does not show :readme after package installation, but sth else To: Philip Kaludercic <philipk@HIDDEN>, Stephen Leake <stephen_leake@HIDDEN> References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN> <8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN> <796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN> <871pocr7ot.fsf@HIDDEN> <86wm648utt.fsf@HIDDEN> <87wm64owhk.fsf@HIDDEN> From: Jens Schmidt <jschmidt4gnu@HIDDEN> Content-Language: de-DE-frami, en-US In-Reply-To: <87wm64owhk.fsf@HIDDEN> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-purgate-type: clean X-purgate: clean X-purgate-size: 2110 X-purgate-ID: 155817::1757757859-7DC22176-34C73EAB/0/0 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 79411 Cc: 79411 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) On 2025-09-12 11:23, Philip Kaludercic wrote: > In my previous message I suggested something like: > > diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el > index ba9999c20e6..b9e2eb96389 100644 > --- a/lisp/emacs-lisp/package.el > +++ b/lisp/emacs-lisp/package.el > @@ -2162,7 +2162,15 @@ package-install-from-archive > ;; Update the new (activated) pkg-desc as well. > (when-let* ((pkg-descs (cdr (assq (package-desc-name pkg-desc) > package-alist)))) > - (setf (package-desc-signed (car pkg-descs)) t)))))))))) > + (setf (package-desc-signed (car pkg-descs)) t))))))) > + ;; fetch a backup of the readme file from the server > + (let ((readme (expand-file-name "README-elpa" (package-desc-dir pkg-desc)))) > + (unless (file-readable-p readme) > + (package--with-response-buffer (package-archive-base pkg-desc) > + :file (format "%s-readme.txt" (package-desc-name pkg-desc)) > + :noerror t > + (write-region nil nil readme))))))) > + > > ;;;###autoload > (defun package-installed-p (package &optional min-version) > > As we store the README file inside the package directory, it should also > be deleted when we delete the package -- unless I am missing something? I like that approach, it should fix this issue, and it nicely complements what elpa-admin.el already does for some readmes on server side. Some notes: 1. You probably should not write README-elpa when it would be empty (which can happen, see https://elpa.gnu.org/packages/bicep-ts-mode-readme.txt), as that would block the search of `package--get-description' for more readmes. 2. Alternatively or in addition, one could extend `package--get-description' to not consider empty files in its search for a readme. 3. I think a paragraph in "(elisp) Packaging Basics" and some tests in package-tests.el would still be required. Do you want me to supply these? Thanks!
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.
Received: (at submit) by debbugs.gnu.org; 12 Sep 2025 09:24:09 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Sep 12 05:24:08 2025
Received: from localhost ([127.0.0.1]:48472 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ux00m-0003rd-4D
for submit <at> debbugs.gnu.org; Fri, 12 Sep 2025 05:24:08 -0400
Received: from lists.gnu.org ([2001:470:142::17]:34848)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <philipk@HIDDEN>)
id 1ux00g-0003pU-Fi
for submit <at> debbugs.gnu.org; Fri, 12 Sep 2025 05:24:03 -0400
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 <philipk@HIDDEN>)
id 1ux00X-0003gZ-Ul
for bug-gnu-emacs@HIDDEN; Fri, 12 Sep 2025 05:23:54 -0400
Received: from mout02.posteo.de ([185.67.36.66])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <philipk@HIDDEN>)
id 1ux00Q-00038p-VE
for bug-gnu-emacs@HIDDEN; Fri, 12 Sep 2025 05:23:49 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 5686B240101
for <bug-gnu-emacs@HIDDEN>; Fri, 12 Sep 2025 11:23:42 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=posteo.net; s=2017;
t=1757669022; bh=4m0J8GBG+GYMdSh0WUBHDbU6U8dB26GK1eDI1uHX3T8=;
h=From:To:Cc:Subject:Autocrypt:OpenPGP:Date:Message-ID:MIME-Version:
Content-Type:From;
b=kTW7vCzqlbEYuH5cJGhlU+gZPUjL1UWslbjsXhjqDrhEPbNBHKACehOcpEZ8ihB7a
PRdVnSgYJyodhqUU0FgQDJq0ksQBRwMp3QlK+FXFZRqS2s8+QltWsCibjGESJmfJoe
8q7clF62hzcrLzRt2lYCtnx58bTxkd9Na30LLY+Xe+FYPdz6/j7gbHWjI7LJ7MZBPv
nEFz4bstNYJC2OGmnEOaEOH7WMk58JnfeOcRwnaxIVi+QenRTJ568lhJXLxWx1XWKK
eudfkX6++imSlJsMzuurmMbxumQPPNFQ0AqUWTH3fSwVlRd2dOm9ecqx+fzkOqI1Ce
9BSw28zk6fEAw==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4cNTWJ5qxcz6v0H;
Fri, 12 Sep 2025 11:23:40 +0200 (CEST)
From: Philip Kaludercic <philipk@HIDDEN>
To: Stephen Leake <stephen_leake@HIDDEN>
Subject: Re: bug#79411: 31.0.50; describe-package does not show :readme
after package installation, but sth else
In-Reply-To: <86wm648utt.fsf@HIDDEN>
References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN>
<8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN>
<796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN>
<871pocr7ot.fsf@HIDDEN> <86wm648utt.fsf@HIDDEN>
Autocrypt: addr=philipk@HIDDEN; keydata=
mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo
aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0
ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI
BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0
mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB
BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE
Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK
NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof
z4oM
OpenPGP: id=7126E1DE2F0CE35C770BED01F2C3CC513DB89F66;
url="https://keys.openpgp.org/vks/v1/by-fingerprint/7126E1DE2F0CE35C770BED01F2C3CC513DB89F66";
preference=signencrypt
Date: Fri, 12 Sep 2025 09:23:41 +0000
Message-ID: <87wm64owhk.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Received-SPF: pass client-ip=185.67.36.66; envelope-from=philipk@HIDDEN;
helo=mout02.posteo.de
X-Spam_score_int: -43
X-Spam_score: -4.4
X-Spam_bar: ----
X-Spam_report: (-4.4 / 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_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001,
RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,
SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: submit
Cc: "Jens Schmidt via Bug reports for GNU Emacs, the Swiss army knife of
text editors" <bug-gnu-emacs@HIDDEN>,
Jens Schmidt <jschmidt4gnu@HIDDEN>, 79411 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
--=-=-=
Content-Type: text/plain
Stephen Leake <stephen_leake@HIDDEN> writes:
> Philip Kaludercic <philipk@HIDDEN> writes:
>
>>> Well, and Emacs did exactly that already until commit
>>> d4fb2690702fbd348977fc94a9f7a99c00cc3010 removed it. Does anybody have
>>> an idea as to why that was removed? (CCing Stephen, the author of that
>>> commit.) The commit message does not quote a bug number, and the only
>>> bug I have found that might be related to this issue is bug#39609, which
>>> seems to be a duplicate of this one.
>>
>> On a quick glance, I cannot see the reason either. But it seems like
>> the reasonable approach, and I don't see a reason why we shouldn't be
>> able to revert that part of the commit.
>
> I don't really remember, but I think the problem was there were old
> readme's hanging around, and the local file was prefered over network
> access, so when you asked for the readme for a package, you got the
> wrong one.
>
> If you can _guarrantee_ that the file is deleted when it's old, that
> would be ok. But that's pretty hard to do.
In my previous message I suggested something like:
--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index ba9999c20e6..b9e2eb96389 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2162,7 +2162,15 @@ package-install-from-archive
;; Update the new (activated) pkg-desc as well.
(when-let* ((pkg-descs (cdr (assq (package-desc-name pkg-desc)
package-alist))))
- (setf (package-desc-signed (car pkg-descs)) t))))))))))
+ (setf (package-desc-signed (car pkg-descs)) t)))))))
+ ;; fetch a backup of the readme file from the server
+ (let ((readme (expand-file-name "README-elpa" (package-desc-dir pkg-desc))))
+ (unless (file-readable-p readme)
+ (package--with-response-buffer (package-archive-base pkg-desc)
+ :file (format "%s-readme.txt" (package-desc-name pkg-desc))
+ :noerror t
+ (write-region nil nil readme)))))))
+
;;;###autoload
(defun package-installed-p (package &optional min-version)
--=-=-=
Content-Type: text/plain
As we store the README file inside the package directory, it should also
be deleted when we delete the package -- unless I am missing something?
--=-=-=--
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.
Received: (at 79411) by debbugs.gnu.org; 12 Sep 2025 09:23:54 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Sep 12 05:23:53 2025
Received: from localhost ([127.0.0.1]:48462 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1ux00W-0003p9-Qa
for submit <at> debbugs.gnu.org; Fri, 12 Sep 2025 05:23:53 -0400
Received: from mout02.posteo.de ([185.67.36.66]:49325)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <philipk@HIDDEN>)
id 1ux00S-0003nc-Mt
for 79411 <at> debbugs.gnu.org; Fri, 12 Sep 2025 05:23:49 -0400
Received: from submission (posteo.de [185.67.36.169])
by mout02.posteo.de (Postfix) with ESMTPS id 582E7240103
for <79411 <at> debbugs.gnu.org>; Fri, 12 Sep 2025 11:23:42 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=posteo.net; s=2017;
t=1757669022; bh=4m0J8GBG+GYMdSh0WUBHDbU6U8dB26GK1eDI1uHX3T8=;
h=From:To:Cc:Subject:Autocrypt:OpenPGP:Date:Message-ID:MIME-Version:
Content-Type:From;
b=kTW7vCzqlbEYuH5cJGhlU+gZPUjL1UWslbjsXhjqDrhEPbNBHKACehOcpEZ8ihB7a
PRdVnSgYJyodhqUU0FgQDJq0ksQBRwMp3QlK+FXFZRqS2s8+QltWsCibjGESJmfJoe
8q7clF62hzcrLzRt2lYCtnx58bTxkd9Na30LLY+Xe+FYPdz6/j7gbHWjI7LJ7MZBPv
nEFz4bstNYJC2OGmnEOaEOH7WMk58JnfeOcRwnaxIVi+QenRTJ568lhJXLxWx1XWKK
eudfkX6++imSlJsMzuurmMbxumQPPNFQ0AqUWTH3fSwVlRd2dOm9ecqx+fzkOqI1Ce
9BSw28zk6fEAw==
Received: from customer (localhost [127.0.0.1])
by submission (posteo.de) with ESMTPSA id 4cNTWJ5qxcz6v0H;
Fri, 12 Sep 2025 11:23:40 +0200 (CEST)
From: Philip Kaludercic <philipk@HIDDEN>
To: Stephen Leake <stephen_leake@HIDDEN>
Subject: Re: bug#79411: 31.0.50; describe-package does not show :readme
after package installation, but sth else
In-Reply-To: <86wm648utt.fsf@HIDDEN>
References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN>
<8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN>
<796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN>
<871pocr7ot.fsf@HIDDEN> <86wm648utt.fsf@HIDDEN>
Autocrypt: addr=philipk@HIDDEN; keydata=
mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo
aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0
ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI
BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0
mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB
BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE
Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK
NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof
z4oM
OpenPGP: id=7126E1DE2F0CE35C770BED01F2C3CC513DB89F66;
url="https://keys.openpgp.org/vks/v1/by-fingerprint/7126E1DE2F0CE35C770BED01F2C3CC513DB89F66";
preference=signencrypt
Date: Fri, 12 Sep 2025 09:23:41 +0000
Message-ID: <87wm64owhk.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 79411
Cc: "Jens Schmidt via Bug reports for GNU Emacs, the Swiss army knife of
text editors" <bug-gnu-emacs@HIDDEN>,
Jens Schmidt <jschmidt4gnu@HIDDEN>, 79411 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
--=-=-=
Content-Type: text/plain
Stephen Leake <stephen_leake@HIDDEN> writes:
> Philip Kaludercic <philipk@HIDDEN> writes:
>
>>> Well, and Emacs did exactly that already until commit
>>> d4fb2690702fbd348977fc94a9f7a99c00cc3010 removed it. Does anybody have
>>> an idea as to why that was removed? (CCing Stephen, the author of that
>>> commit.) The commit message does not quote a bug number, and the only
>>> bug I have found that might be related to this issue is bug#39609, which
>>> seems to be a duplicate of this one.
>>
>> On a quick glance, I cannot see the reason either. But it seems like
>> the reasonable approach, and I don't see a reason why we shouldn't be
>> able to revert that part of the commit.
>
> I don't really remember, but I think the problem was there were old
> readme's hanging around, and the local file was prefered over network
> access, so when you asked for the readme for a package, you got the
> wrong one.
>
> If you can _guarrantee_ that the file is deleted when it's old, that
> would be ok. But that's pretty hard to do.
In my previous message I suggested something like:
--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index ba9999c20e6..b9e2eb96389 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -2162,7 +2162,15 @@ package-install-from-archive
;; Update the new (activated) pkg-desc as well.
(when-let* ((pkg-descs (cdr (assq (package-desc-name pkg-desc)
package-alist))))
- (setf (package-desc-signed (car pkg-descs)) t))))))))))
+ (setf (package-desc-signed (car pkg-descs)) t)))))))
+ ;; fetch a backup of the readme file from the server
+ (let ((readme (expand-file-name "README-elpa" (package-desc-dir pkg-desc))))
+ (unless (file-readable-p readme)
+ (package--with-response-buffer (package-archive-base pkg-desc)
+ :file (format "%s-readme.txt" (package-desc-name pkg-desc))
+ :noerror t
+ (write-region nil nil readme)))))))
+
;;;###autoload
(defun package-installed-p (package &optional min-version)
--=-=-=
Content-Type: text/plain
As we store the README file inside the package directory, it should also
be deleted when we delete the package -- unless I am missing something?
--=-=-=--
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.Received: (at 79411) by debbugs.gnu.org; 11 Sep 2025 22:53:47 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 11 18:53:47 2025 Received: from localhost ([127.0.0.1]:45750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uwqAl-0006ZD-1K for submit <at> debbugs.gnu.org; Thu, 11 Sep 2025 18:53:47 -0400 Received: from omta038.useast.a.cloudfilter.net ([44.202.169.37]:41263) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <stephen_leake@HIDDEN>) id 1uwqAh-0006Yq-AA for 79411 <at> debbugs.gnu.org; Thu, 11 Sep 2025 18:53:44 -0400 Received: from eig-obgw-5001b.ext.cloudfilter.net ([10.0.29.181]) by cmsmtp with ESMTPS id wnWUuEc8OSkcfwqAcuIsyM; Thu, 11 Sep 2025 22:53:38 +0000 Received: from host2007.hostmonster.com ([67.20.76.71]) by cmsmtp with ESMTPS id wqAburinsEzdIwqAbun3iN; Thu, 11 Sep 2025 22:53:37 +0000 X-Authority-Analysis: v=2.4 cv=D9ZHKuRj c=1 sm=1 tr=0 ts=68c352f1 a=dWLzHQi6WpdymmZIwiVdBw==:117 a=X6nE+nGRlvPt3bYeHJ+bUA==:17 a=yJojWOMRYYMA:10 a=R6gVdyKA5RkA:10 a=uChsZFC9AAAA:8 a=VKlnHIy4OvVyF5rZu3sA:9 a=zZCYzV9kfG8A:10 a=ULtXvzFHYWHLyBAuiDia:22 a=wpHNV4C6wHli_NQ8I9Qc:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=stephe-leake.org; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=jvWFFbrnc7waL9X4owDFYWEeb2mA5Z6VCxAQE1bXZG4=; b=lJfy+ruJwixKS45Hz/HB8h3Hy/ +ONmNCmQ0Pz2zKMRKzvnTu+XG3Ar3cNdF1QZP0s9nCT9HaHoTZ9h+qJ6EigC5Rml5nco96zfIJEEd WP4N76If4Z8RycSBZir5uUr7mPb7FSgdZrPP7RNpBONvgdgIyFRl+czLdA4sYrBpzSQJK0Buhn2F6 w1Cz9aCDbMKzl3pHQ7+zqDWz25A11AEBp1wosWbY+LvGH5+CQvFit0BQdxkChanHLGFKh86CYnDoR 0mMnAW8b3ZqRj0PRb5FOLOMtBgGCd3ThKVBDrk5PJQZidJvXoeSPpbZWzjarim9aOFg1ERx141S6g BurA9JbA==; Received: from 135-180-160-85.fiber.dynamic.sonic.net ([135.180.160.85]:54463 helo=DESKTOP-G20DCG1) by host2007.hostmonster.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from <stephen_leake@HIDDEN>) id 1uwqAa-000000043eH-2UNz; Thu, 11 Sep 2025 16:53:36 -0600 From: Stephen Leake <stephen_leake@HIDDEN> To: Philip Kaludercic <philipk@HIDDEN> Subject: Re: bug#79411: 31.0.50; describe-package does not show :readme after package installation, but sth else In-Reply-To: <871pocr7ot.fsf@HIDDEN> (Philip Kaludercic's message of "Thu, 11 Sep 2025 21:38:28 +0000") References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN> <8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN> <796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN> <871pocr7ot.fsf@HIDDEN> Date: Thu, 11 Sep 2025 15:53:34 -0700 Message-ID: <86wm648utt.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - host2007.hostmonster.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - stephe-leake.org X-BWhitelist: no X-Source-IP: 135.180.160.85 X-Source-L: No X-Exim-ID: 1uwqAa-000000043eH-2UNz X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 135-180-160-85.fiber.dynamic.sonic.net (DESKTOP-G20DCG1) [135.180.160.85]:54463 X-Source-Auth: stephen_leake@HIDDEN X-Email-Count: 3 X-Org: HG=bhshared_hm;ORG=bluehost; X-Source-Cap: c3RlcGhlbGU7c3RlcGhlbGU7aG9zdDIwMDcuaG9zdG1vbnN0ZXIuY29t X-Local-Domain: yes X-CMAE-Envelope: MS4xfAjfCHT1R0weie6WtnOU8jGGyf91ArgwuqW5W612n8+Gbqa4uhpnzO++ld9xHhDa/pPwwdBPRstzyEOpyda8tBYHnFvhGAoNmZahI9ms+ADKYv33Qiai pCNVuvhgMrsFVs5O1KjgptjQSxRLyisiWwWuYmAYJsuYt5MAPnAPt9v52blO5vO7cXeuFYbJRRN0ofMVH0eTBr2Y2Hcb2qNA5J8= X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 79411 Cc: "Jens Schmidt via Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@HIDDEN>, Jens Schmidt <jschmidt4gnu@HIDDEN>, 79411 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Philip Kaludercic <philipk@HIDDEN> writes: >> Well, and Emacs did exactly that already until commit >> d4fb2690702fbd348977fc94a9f7a99c00cc3010 removed it. Does anybody have >> an idea as to why that was removed? (CCing Stephen, the author of that >> commit.) The commit message does not quote a bug number, and the only >> bug I have found that might be related to this issue is bug#39609, which >> seems to be a duplicate of this one. > > On a quick glance, I cannot see the reason either. But it seems like > the reasonable approach, and I don't see a reason why we shouldn't be > able to revert that part of the commit. I don't really remember, but I think the problem was there were old readme's hanging around, and the local file was prefered over network access, so when you asked for the readme for a package, you got the wrong one. If you can _guarrantee_ that the file is deleted when it's old, that would be ok. But that's pretty hard to do. -- -- Stephe
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.Received: (at submit) by debbugs.gnu.org; 11 Sep 2025 22:53:53 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 11 18:53:53 2025 Received: from localhost ([127.0.0.1]:45753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uwqAq-0006ZX-Gy for submit <at> debbugs.gnu.org; Thu, 11 Sep 2025 18:53:53 -0400 Received: from lists.gnu.org ([2001:470:142::17]:40904) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <stephen_leake@HIDDEN>) id 1uwqAo-0006Z6-QE for submit <at> debbugs.gnu.org; Thu, 11 Sep 2025 18:53:51 -0400 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 <stephen_leake@HIDDEN>) id 1uwqAj-00086V-HA for bug-gnu-emacs@HIDDEN; Thu, 11 Sep 2025 18:53:45 -0400 Received: from omta038.useast.a.cloudfilter.net ([44.202.169.37]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <stephen_leake@HIDDEN>) id 1uwqAh-0004Ca-SO for bug-gnu-emacs@HIDDEN; Thu, 11 Sep 2025 18:53:45 -0400 Received: from eig-obgw-6002b.ext.cloudfilter.net ([10.0.30.203]) by cmsmtp with ESMTPS id wkDWuDXI0SkcfwqAbuIsyJ; Thu, 11 Sep 2025 22:53:38 +0000 Received: from host2007.hostmonster.com ([67.20.76.71]) by cmsmtp with ESMTPS id wqAbuisk4g4f0wqAbuVros; Thu, 11 Sep 2025 22:53:37 +0000 X-Authority-Analysis: v=2.4 cv=CrO/cm4D c=1 sm=1 tr=0 ts=68c352f1 a=dWLzHQi6WpdymmZIwiVdBw==:117 a=X6nE+nGRlvPt3bYeHJ+bUA==:17 a=yJojWOMRYYMA:10 a=R6gVdyKA5RkA:10 a=uChsZFC9AAAA:8 a=VKlnHIy4OvVyF5rZu3sA:9 a=zZCYzV9kfG8A:10 a=ULtXvzFHYWHLyBAuiDia:22 a=wpHNV4C6wHli_NQ8I9Qc:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=stephe-leake.org; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=jvWFFbrnc7waL9X4owDFYWEeb2mA5Z6VCxAQE1bXZG4=; b=lJfy+ruJwixKS45Hz/HB8h3Hy/ +ONmNCmQ0Pz2zKMRKzvnTu+XG3Ar3cNdF1QZP0s9nCT9HaHoTZ9h+qJ6EigC5Rml5nco96zfIJEEd WP4N76If4Z8RycSBZir5uUr7mPb7FSgdZrPP7RNpBONvgdgIyFRl+czLdA4sYrBpzSQJK0Buhn2F6 w1Cz9aCDbMKzl3pHQ7+zqDWz25A11AEBp1wosWbY+LvGH5+CQvFit0BQdxkChanHLGFKh86CYnDoR 0mMnAW8b3ZqRj0PRb5FOLOMtBgGCd3ThKVBDrk5PJQZidJvXoeSPpbZWzjarim9aOFg1ERx141S6g BurA9JbA==; Received: from 135-180-160-85.fiber.dynamic.sonic.net ([135.180.160.85]:54463 helo=DESKTOP-G20DCG1) by host2007.hostmonster.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from <stephen_leake@HIDDEN>) id 1uwqAa-000000043eH-2UNz; Thu, 11 Sep 2025 16:53:36 -0600 From: Stephen Leake <stephen_leake@HIDDEN> To: Philip Kaludercic <philipk@HIDDEN> Subject: Re: bug#79411: 31.0.50; describe-package does not show :readme after package installation, but sth else In-Reply-To: <871pocr7ot.fsf@HIDDEN> (Philip Kaludercic's message of "Thu, 11 Sep 2025 21:38:28 +0000") References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN> <8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN> <796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN> <871pocr7ot.fsf@HIDDEN> Date: Thu, 11 Sep 2025 15:53:34 -0700 Message-ID: <86wm648utt.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - host2007.hostmonster.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - stephe-leake.org X-BWhitelist: no X-Source-IP: 135.180.160.85 X-Source-L: No X-Exim-ID: 1uwqAa-000000043eH-2UNz X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 135-180-160-85.fiber.dynamic.sonic.net (DESKTOP-G20DCG1) [135.180.160.85]:54463 X-Source-Auth: stephen_leake@HIDDEN X-Email-Count: 2 X-Org: HG=bhshared_hm;ORG=bluehost; X-Source-Cap: c3RlcGhlbGU7c3RlcGhlbGU7aG9zdDIwMDcuaG9zdG1vbnN0ZXIuY29t X-Local-Domain: yes X-CMAE-Envelope: MS4xfMN67sXtstj3m4jOkURb4rmINDS2dsCixgRPoZSV/iXBJI6LX+xPOcFUSC7izCLI9Nb+WHdjPhU+IjUQXO84eLJp1EYKwAwpiklSIFtAkTMsfsJ+tUjC Qa0jDIRuIJFm2UKkyDPeuopRmTNDuSt9j246zPJXrATNDgN3sik8RpuNb2YAIKgKE9evzB/+IVvJhBk+YG8DRscbDnd4HkXlBNk= Received-SPF: pass client-ip=44.202.169.37; envelope-from=stephen_leake@HIDDEN; helo=omta038.useast.a.cloudfilter.net X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.7 (/) X-Debbugs-Envelope-To: submit Cc: "Jens Schmidt via Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@HIDDEN>, Jens Schmidt <jschmidt4gnu@HIDDEN>, 79411 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.3 (/) Philip Kaludercic <philipk@HIDDEN> writes: >> Well, and Emacs did exactly that already until commit >> d4fb2690702fbd348977fc94a9f7a99c00cc3010 removed it. Does anybody have >> an idea as to why that was removed? (CCing Stephen, the author of that >> commit.) The commit message does not quote a bug number, and the only >> bug I have found that might be related to this issue is bug#39609, which >> seems to be a duplicate of this one. > > On a quick glance, I cannot see the reason either. But it seems like > the reasonable approach, and I don't see a reason why we shouldn't be > able to revert that part of the commit. I don't really remember, but I think the problem was there were old readme's hanging around, and the local file was prefered over network access, so when you asked for the readme for a package, you got the wrong one. If you can _guarrantee_ that the file is deleted when it's old, that would be ok. But that's pretty hard to do. -- -- Stephe
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.Received: (at 79411) by debbugs.gnu.org; 11 Sep 2025 21:38:38 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 11 17:38:38 2025 Received: from localhost ([127.0.0.1]:45342 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uwp01-0001wQ-IA for submit <at> debbugs.gnu.org; Thu, 11 Sep 2025 17:38:38 -0400 Received: from mout01.posteo.de ([185.67.36.65]:46787) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <philipk@HIDDEN>) id 1uwozy-0001wB-UJ for 79411 <at> debbugs.gnu.org; Thu, 11 Sep 2025 17:38:36 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 72543240027 for <79411 <at> debbugs.gnu.org>; Thu, 11 Sep 2025 23:38:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=posteo.net; s=2017; t=1757626708; bh=fnhZGkpAA9PdAWn9LBScj54wlDJgXnudQXxt7YuSYhk=; h=From:To:Cc:Subject:Autocrypt:OpenPGP:Date:Message-ID:MIME-Version: Content-Type:From; b=TMZ465UnnTcEBXkjX04TTqgwXMRCRyyclA38Q5LR1B9/kQTh1hwQJLGp7IuNpWQQd WFN9PfGPhgkfjG2Pe7SWdvJC87oW0uSb5y+qJ5GYhEfRKji4Pj4b1oyKZ8LCOwW3ku 60t01qdhKntEHBM6X17QHk5bbdwxlJsAvUii40GMZNE3GxOMdOClEHBWddAq2D1FS6 rxsMUZro88F7Xa5IEAHTupbvVG4YY0vNfwhl1886/954zS0wuYt8XykouLDcDTR4F6 16K+yVpooOEK9mrAvP3n0PRkgJyU3m2YPTOjviHdf2EzmnSjNDnfYmz7KQ4dGHFNRk 0o6w4ztOQb9Cw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4cN9sb1ssJz6twB; Thu, 11 Sep 2025 23:38:27 +0200 (CEST) From: Philip Kaludercic <philipk@HIDDEN> To: Jens Schmidt via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@HIDDEN> Subject: Re: bug#79411: 31.0.50; describe-package does not show :readme after package installation, but sth else In-Reply-To: <796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN> References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN> <8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN> <796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN> Autocrypt: addr=philipk@HIDDEN; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM OpenPGP: id=7126E1DE2F0CE35C770BED01F2C3CC513DB89F66; url="https://keys.openpgp.org/vks/v1/by-fingerprint/7126E1DE2F0CE35C770BED01F2C3CC513DB89F66"; preference=signencrypt Date: Thu, 11 Sep 2025 21:38:28 +0000 Message-ID: <871pocr7ot.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 79411 Cc: Stephen Leake <stephen_leake@HIDDEN>, Jens Schmidt <jschmidt4gnu@HIDDEN>, 79411 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Jens Schmidt via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@HIDDEN> writes: > On 2025-09-08 22:56, Philip Kaludercic wrote: > >> Hi, if you have a reasonable patch, I would gladly review it. The >> behaviour you describe does fundamentally sound confusing, and it >> would be nice to come up with a solution. > > Thanks for your quick reply and for caring about ELPA, package.el, and > the packaging system in general! Thanks! And sorry for the delay this time around, I didn't have access to my laptop until now :) > Only having a "reasonable" solution is more difficult than I initially > thought ... I started edebugging and eyeballing that code only after > filing this bug, sorry. > > So here are some facts, not to lecture you, but to have them summarized > and probably corrected, if I got them wrong: > > - I have been hoping on the ELPA metadata, like, :news, :doc:, :readme > etc., but that's not part of the archive web server contract (as in > (elisp) Archive Web Server). > > The only thing we can get from an archive web server to help with this > issue is file <package name>-readme.txt. > > - For the following reasons it is not reasonable to access that file > online *for installed packages*: > > + The user might be offline. > + A package, once installed, forgets about its originating archive, > and determining a matching archive might be difficult. > + The file on the archive web server is not versioned, so it might not > match the version of the installed package. 100% agree here. > - So the only thing that seems reasonable is to download <package > name>-readme.txt during package installation and store it below > `package-user-dir'. And remove it during package deinstallation. > > Well, and Emacs did exactly that already until commit > d4fb2690702fbd348977fc94a9f7a99c00cc3010 removed it. Does anybody have > an idea as to why that was removed? (CCing Stephen, the author of that > commit.) The commit message does not quote a bug number, and the only > bug I have found that might be related to this issue is bug#39609, which > seems to be a duplicate of this one. On a quick glance, I cannot see the reason either. But it seems like the reasonable approach, and I don't see a reason why we shouldn't be able to revert that part of the commit. > Please advise how to continue here. I can live with this issue and, as > a work-around for my package, prepare file "README-elpa.md" as a copy of > my "README.md" when ELPA processes the :make property. (That should > work, shouldn't it?) I would like to avoid :make properties in package specifications. To build on your last suggestion, we can just make package.el download the -readme.txt as README-elpa in the package directory (if it doesn't already exist). This would also have the advantage of not complicating the cleanup procedure, as removing the directory would automatically clean up the README file. > Thanks!
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.Received: (at submit) by debbugs.gnu.org; 11 Sep 2025 21:38:42 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 11 17:38:42 2025 Received: from localhost ([127.0.0.1]:45345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uwp05-0001wg-Ac for submit <at> debbugs.gnu.org; Thu, 11 Sep 2025 17:38:42 -0400 Received: from lists.gnu.org ([2001:470:142::17]:34418) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <philipk@HIDDEN>) id 1uwp01-0001wF-NS for submit <at> debbugs.gnu.org; Thu, 11 Sep 2025 17:38:38 -0400 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 <philipk@HIDDEN>) id 1uwozv-0008UF-Tk for bug-gnu-emacs@HIDDEN; Thu, 11 Sep 2025 17:38:32 -0400 Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <philipk@HIDDEN>) id 1uwozt-0002S4-Q4 for bug-gnu-emacs@HIDDEN; Thu, 11 Sep 2025 17:38:31 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 41161240101 for <bug-gnu-emacs@HIDDEN>; Thu, 11 Sep 2025 23:38:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=posteo.net; s=2017; t=1757626708; bh=fnhZGkpAA9PdAWn9LBScj54wlDJgXnudQXxt7YuSYhk=; h=From:To:Cc:Subject:Autocrypt:OpenPGP:Date:Message-ID:MIME-Version: Content-Type:From; b=TMZ465UnnTcEBXkjX04TTqgwXMRCRyyclA38Q5LR1B9/kQTh1hwQJLGp7IuNpWQQd WFN9PfGPhgkfjG2Pe7SWdvJC87oW0uSb5y+qJ5GYhEfRKji4Pj4b1oyKZ8LCOwW3ku 60t01qdhKntEHBM6X17QHk5bbdwxlJsAvUii40GMZNE3GxOMdOClEHBWddAq2D1FS6 rxsMUZro88F7Xa5IEAHTupbvVG4YY0vNfwhl1886/954zS0wuYt8XykouLDcDTR4F6 16K+yVpooOEK9mrAvP3n0PRkgJyU3m2YPTOjviHdf2EzmnSjNDnfYmz7KQ4dGHFNRk 0o6w4ztOQb9Cw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4cN9sb1ssJz6twB; Thu, 11 Sep 2025 23:38:27 +0200 (CEST) From: Philip Kaludercic <philipk@HIDDEN> To: Jens Schmidt via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@HIDDEN> Subject: Re: bug#79411: 31.0.50; describe-package does not show :readme after package installation, but sth else In-Reply-To: <796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN> References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN> <8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN> <796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN> Autocrypt: addr=philipk@HIDDEN; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM OpenPGP: id=7126E1DE2F0CE35C770BED01F2C3CC513DB89F66; url="https://keys.openpgp.org/vks/v1/by-fingerprint/7126E1DE2F0CE35C770BED01F2C3CC513DB89F66"; preference=signencrypt Date: Thu, 11 Sep 2025 21:38:28 +0000 Message-ID: <871pocr7ot.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=185.67.36.66; envelope-from=philipk@HIDDEN; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Stephen Leake <stephen_leake@HIDDEN>, Jens Schmidt <jschmidt4gnu@HIDDEN>, 79411 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) Jens Schmidt via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@HIDDEN> writes: > On 2025-09-08 22:56, Philip Kaludercic wrote: > >> Hi, if you have a reasonable patch, I would gladly review it. The >> behaviour you describe does fundamentally sound confusing, and it >> would be nice to come up with a solution. > > Thanks for your quick reply and for caring about ELPA, package.el, and > the packaging system in general! Thanks! And sorry for the delay this time around, I didn't have access to my laptop until now :) > Only having a "reasonable" solution is more difficult than I initially > thought ... I started edebugging and eyeballing that code only after > filing this bug, sorry. > > So here are some facts, not to lecture you, but to have them summarized > and probably corrected, if I got them wrong: > > - I have been hoping on the ELPA metadata, like, :news, :doc:, :readme > etc., but that's not part of the archive web server contract (as in > (elisp) Archive Web Server). > > The only thing we can get from an archive web server to help with this > issue is file <package name>-readme.txt. > > - For the following reasons it is not reasonable to access that file > online *for installed packages*: > > + The user might be offline. > + A package, once installed, forgets about its originating archive, > and determining a matching archive might be difficult. > + The file on the archive web server is not versioned, so it might not > match the version of the installed package. 100% agree here. > - So the only thing that seems reasonable is to download <package > name>-readme.txt during package installation and store it below > `package-user-dir'. And remove it during package deinstallation. > > Well, and Emacs did exactly that already until commit > d4fb2690702fbd348977fc94a9f7a99c00cc3010 removed it. Does anybody have > an idea as to why that was removed? (CCing Stephen, the author of that > commit.) The commit message does not quote a bug number, and the only > bug I have found that might be related to this issue is bug#39609, which > seems to be a duplicate of this one. On a quick glance, I cannot see the reason either. But it seems like the reasonable approach, and I don't see a reason why we shouldn't be able to revert that part of the commit. > Please advise how to continue here. I can live with this issue and, as > a work-around for my package, prepare file "README-elpa.md" as a copy of > my "README.md" when ELPA processes the :make property. (That should > work, shouldn't it?) I would like to avoid :make properties in package specifications. To build on your last suggestion, we can just make package.el download the -readme.txt as README-elpa in the package directory (if it doesn't already exist). This would also have the advantage of not complicating the cleanup procedure, as removing the directory would automatically clean up the README file. > Thanks!
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.
Received: (at 79411) by debbugs.gnu.org; 9 Sep 2025 12:01:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Sep 09 08:01:02 2025
Received: from localhost ([127.0.0.1]:58264 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uvx1x-00023B-JL
for submit <at> debbugs.gnu.org; Tue, 09 Sep 2025 08:01:01 -0400
Received: from mr5.vodafonemail.de ([145.253.228.165]:55676)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <jschmidt4gnu@HIDDEN>)
id 1uvx1t-00022S-VW
for 79411 <at> debbugs.gnu.org; Tue, 09 Sep 2025 08:01:00 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vodafonemail.de;
s=vfde-mb-mr2-23sep; t=1757419250;
bh=3TY74c9j12eX9HhmJYCEdoLAdl+Bae3l28S5IInpQ4E=;
h=Message-ID:Date:User-Agent:From:Subject:To:References:
Content-Language:In-Reply-To:Content-Type:From;
b=lahZuff+jYw5uf+5rlvh8RCJjhsJStKxGSGBv/+Ixee6Iu6/XZYep88y2eDzqLm8b
BsWIh4iH5DVc67GrvtdELiMUxcvpzA1hM1ysa5M+bGteFofEgd3dFtiDYeJ1H12Q6C
Wwf64vjKRxeEXelJIRZIuTng6Jk+gY75gTmscunU=
Received: from smtp.vodafone.de (unknown [10.0.0.2])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by mr5.vodafonemail.de (Postfix) with ESMTPS id 4cLj820y91z1y7s;
Tue, 9 Sep 2025 12:00:50 +0000 (UTC)
Received: from [192.168.1.45] (87-90-44-210.abo.bbox.fr [87.90.44.210])
(using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by smtp.vodafone.de (Postfix) with ESMTPSA id 4cLj7p6dlWz8sYJ;
Tue, 9 Sep 2025 12:00:35 +0000 (UTC)
Message-ID: <796ce08c-46b5-4106-9957-98b6a8e44114@HIDDEN>
Date: Tue, 9 Sep 2025 14:00:34 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
From: Jens Schmidt <jschmidt4gnu@HIDDEN>
Subject: Re: bug#79411: 31.0.50; describe-package does not show :readme after
package installation, but sth else
To: Philip Kaludercic <philipk@HIDDEN>, 79411 <at> debbugs.gnu.org
References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN>
<8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN>
Content-Language: de-DE-frami, en-US
In-Reply-To: <8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
X-purgate-type: clean
X-purgate: clean
X-purgate-size: 2168
X-purgate-ID: 155817::1757419245-A4F54E0A-2A3CF9E1/0/0
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 79411
Cc: Stephen Leake <stephen_leake@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
On 2025-09-08 22:56, Philip Kaludercic wrote:
> Hi, if you have a reasonable patch, I would gladly review it. The
> behaviour you describe does fundamentally sound confusing, and it
> would be nice to come up with a solution.
Thanks for your quick reply and for caring about ELPA, package.el, and
the packaging system in general!
Only having a "reasonable" solution is more difficult than I initially
thought ... I started edebugging and eyeballing that code only after
filing this bug, sorry.
So here are some facts, not to lecture you, but to have them summarized
and probably corrected, if I got them wrong:
- I have been hoping on the ELPA metadata, like, :news, :doc:, :readme
etc., but that's not part of the archive web server contract (as in
(elisp) Archive Web Server).
The only thing we can get from an archive web server to help with this
issue is file <package name>-readme.txt.
- For the following reasons it is not reasonable to access that file
online *for installed packages*:
+ The user might be offline.
+ A package, once installed, forgets about its originating archive,
and determining a matching archive might be difficult.
+ The file on the archive web server is not versioned, so it might not
match the version of the installed package.
- So the only thing that seems reasonable is to download <package
name>-readme.txt during package installation and store it below
`package-user-dir'. And remove it during package deinstallation.
Well, and Emacs did exactly that already until commit
d4fb2690702fbd348977fc94a9f7a99c00cc3010 removed it. Does anybody have
an idea as to why that was removed? (CCing Stephen, the author of that
commit.) The commit message does not quote a bug number, and the only
bug I have found that might be related to this issue is bug#39609, which
seems to be a duplicate of this one.
Please advise how to continue here. I can live with this issue and, as
a work-around for my package, prepare file "README-elpa.md" as a copy of
my "README.md" when ELPA processes the :make property. (That should
work, shouldn't it?)
Thanks!
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.Received: (at 79411) by debbugs.gnu.org; 8 Sep 2025 20:56:56 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Sep 08 16:56:56 2025 Received: from localhost ([127.0.0.1]:53046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uviuy-0002EV-SF for submit <at> debbugs.gnu.org; Mon, 08 Sep 2025 16:56:56 -0400 Received: from mout01.posteo.de ([185.67.36.65]:53881) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <philipk@HIDDEN>) id 1uviuo-0002CK-Tj for 79411 <at> debbugs.gnu.org; Mon, 08 Sep 2025 16:56:46 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 6C50D240027 for <79411 <at> debbugs.gnu.org>; Mon, 8 Sep 2025 22:56:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=posteo.net; s=2017; t=1757364996; bh=dDQD0godw5tTIxcGcCt/A5bWvJEaysC3G6xIX/XaGPE=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=KELE1t9MFR9dBI3slu+gFifwsZvOMAyqOVLnO4x4BhSUhxEplHEcGV0QXFuF5Ndla doXcMlzDLlNBm5KFJ+CFlKBrwz08VC6c9h69phufgdksgsn84NoHxXG484XiBVpgAc ow9m12nlvLM9OajNK/3frLI/XuodsFYtQ/UxdYSkZcIZEqdnkYxkwntN07BfbbDTKv HJ7z9HqePURRe8C/D9Jo8nm+lOJNiFBPbo88IGUnx836SR3aYB7cMGMZw/3wUpYqJm TirQKca+Hdn6OflVfMioUwXCN5KvtrwUz8fCP7MrFgraroeLlQvdXYj8jXj6jhaomc Hpue6s7rBc3fA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4cLK4g4lhzz6v0M; Mon, 8 Sep 2025 22:56:35 +0200 (CEST) Date: Mon, 08 Sep 2025 20:56:36 +0000 From: Philip Kaludercic <philipk@HIDDEN> To: debbugs-submit <at> debbugs.gnu.org, Jens Schmidt <jschmidt4gnu@HIDDEN>, 79411 <at> debbugs.gnu.org Subject: =?US-ASCII?Q?Re=3A_bug=2379411=3A_31=2E0=2E50=3B_d?= =?US-ASCII?Q?escribe-package_does_not_s?= =?US-ASCII?Q?how_=3Areadme_after_package_installation=2C_but_sth_else?= In-Reply-To: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN> References: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN> Message-ID: <8C4CB26A-14C6-4CBB-8B7E-F5C0862C3E29@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 79411 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -3.3 (---) Hi, if you have a reasonable patch, I would gladly review it=2E The behavi= our you describe does fundamentally sound confusing, and it would be nice t= o come up with a solution=2E On 8 September 2025 22:18:43 CEST, Jens Schmidt <jschmidt4gnu@vodafonemail= =2Ede> wrote: >X-Debbugs-Cc: Philip Kaludercic <philipk@posteo=2Enet> > >Move your `package-user-dir' temporarily away=2E Then start "=2E/src/ema= cs >-Q"=2E Then: > >M-x package-initialize RET >M-x package-list-packages RET >C-h P beframe RET > >This shows the README=2Emd as package description, as defined by >Prots through property :readme: > > # Beframe (beframe=2Eel) for GNU Emacs > > `beframe` enables a frame-oriented Emacs workflow where each frame has > access to the list of buffers visited therein=2E In the interest of > brevity, we call buffers that belong to frames "beframed"=2E > > **Video demo:** <https://protesilaos=2Ecom/codelog/2023-02-28-emacs-bef= rame-demo/> > > + Package name (GNU ELPA): `beframe` > + Official manual: <https://protesilaos=2Ecom/emacs/beframe> > + Change log: <https://protesilaos=2Ecom/emacs/beframe-changelog> > + Git repositories: > + GitHub: <https://github=2Ecom/protesilaos/beframe> > + GitLab: <https://gitlab=2Ecom/protesilaos/beframe> > + Backronym: Buffers Encapsulated in Frames Realise Advanced > Management of Emacs=2E > >Then: > >M-x package-install beframe RET >C-h P beframe RET > >Now this shows the README=2Eorg file as package description, which >in that place is =2E=2E=2E ugly=2E I am aware of the following comment >in function `package--get-description': > > ;; We don=E2=80=99t include README=2Emd here, because that is often the= home > ;; page on a site like github, and not suitable as the package long > ;; description=2E > >But probably if a package author has willfully designed her/his >README=2Emd to be used as property :readme, then it should also be >used for installed packages [1]? Probably if there is a :readme >property, then function `package--get-description' should even >always use that, and not resort to guessing [2]? > >If you agree and want me to provide a patch to that effect ([1] >or [2]?), please let me know=2E > >[ I'm filing/asking this because I have been planning to use a > combination of (:readme "README=2Emd" :doc "README=2Eorg") similar > to what Prots has been doing for his beframe package=2E ] > >In GNU Emacs 31=2E0=2E50 (build 6, x86_64-pc-linux-gnu, GTK+ Version > 3=2E24=2E38, cairo version 1=2E16=2E0) of 2025-09-08 built on sappc2 >Repository revision: 4c74b68fb1f23db6ba770f7322efe378f3492751 >Repository branch: master >Windowing system distributor 'The X=2EOrg Foundation', version 11=2E0=2E1= 2201009 >System Description: Debian GNU/Linux 12 (bookworm) > >Configured using: > 'configure --with-native-compilation --with-mailutils' > >Configured features: >ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG >LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT MODULES NATIVE_COMP >NOTIFY INOTIFY PDUMPER PNG RSVG SECCOMP SOUND THREADS TIFF >TOOLKIT_SCROLL_BARS WEBP X11 XDBE XIM XINERAMA XINPUT2 XPM XRANDR GTK3 >ZLIB > >Important settings: > value of $LC_COLLATE: POSIX > value of $LC_TIME: POSIX > value of $LANG: en_US=2EUTF-8 > value of $XMODIFIERS: @im=3Dibus > locale-coding-system: utf-8-unix > >Major mode: Lisp Interaction > >Minor modes in effect: > tooltip-mode: t > global-eldoc-mode: t > eldoc-mode: t > show-paren-mode: t > electric-indent-mode: t > mouse-wheel-mode: t > tool-bar-mode: t > menu-bar-mode: t > file-name-shadow-mode: t > global-font-lock-mode: t > font-lock-mode: t > blink-cursor-mode: t > minibuffer-regexp-mode: t > line-number-mode: t > indent-tabs-mode: t > transient-mark-mode: t > auto-composition-mode: t > auto-encryption-mode: t > auto-compression-mode: t > >Load-path shadows: >None found=2E > >Features: >(shadow sort mail-extr emacsbug transient pcase format-spec edmacro >kmacro warnings info beframe-autoloads easy-mmode loaddefs-gen tar-mode >arc-mode archive-mode novice cus-edit pp cus-start cus-load wid-edit >lisp-mnt misearch multi-isearch cl-extra cl-print help-fns radix-tree >help-mode mm-archive message sendmail yank-media dired dired-loaddefs >rfc822 mml mml-sec epa derived gnus-util time-date mailabbrev gmm-utils >mailheader mm-decode mm-bodies mm-encode mail-utils mule-util gnutls >network-stream url-cache url-http url-auth mail-parse rfc2231 rfc2047 >rfc2045 mm-util ietf-drums mail-prsvr url-gw nsm puny epg rfc6068 >epg-config display-line-numbers compile text-property-search comint >ansi-osc ansi-color ring comp-run comp-common rx finder-inf thingatpt >package browse-url xdg url url-proxy url-privacy url-expand url-methods >url-history url-cookie generate-lisp-file url-domsuf url-util mailcap >url-handlers url-parse auth-source cl-seq eieio eieio-core cl-macs icons >password-cache json subr-x map byte-opt gv bytecomp byte-compile >url-vars cl-loaddefs cl-lib rmc iso-transl tooltip cconv eldoc paren >electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel >term/x-win x-win term/common-win x-dnd touch-screen tool-bar dnd fontset >image regexp-opt fringe tabulated-list replace newcomment text-mode >lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch >easymenu timer select scroll-bar mouse jit-lock font-lock syntax >font-core term/tty-colors frame minibuffer nadvice seq simple cl-generic >indonesian philippine cham georgian utf-8-lang misc-lang vietnamese >tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek >romanian slovak czech european ethiopic indian cyrillic chinese >composite emoji-zwj charscript charprop case-table epa-hook >jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs >theme-loaddefs faces cus-face macroexp files window text-properties >overlay sha1 md5 base64 format env code-pages mule custom widget keymap >hashtable-print-readable backquote threads dbusbind inotify lcms2 >dynamic-setting system-font-setting font-render-setting cairo gtk >x-toolkit xinput2 x multi-tty move-toolbar make-network-process >tty-child-frames native-compile emacs) > >Memory information: >((conses 16 348941 46086) (symbols 48 13566 0) (strings 32 67396 5547) > (string-bytes 1 1770646) (vectors 16 33740) > (vector-slots 8 746562 66527) (floats 8 61 158) > (intervals 56 25221 0) (buffers 984 16)) > > > Sent from my phone
bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.
Received: (at submit) by debbugs.gnu.org; 8 Sep 2025 20:19:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Sep 08 16:19:25 2025
Received: from localhost ([127.0.0.1]:52902 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uviKf-00058k-RZ
for submit <at> debbugs.gnu.org; Mon, 08 Sep 2025 16:19:25 -0400
Received: from lists.gnu.org ([2001:470:142::17]:39054)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <jschmidt4gnu@HIDDEN>)
id 1uviKY-000573-Tk
for submit <at> debbugs.gnu.org; Mon, 08 Sep 2025 16:19:19 -0400
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 <jschmidt4gnu@HIDDEN>)
id 1uviKS-000676-5D
for bug-gnu-emacs@HIDDEN; Mon, 08 Sep 2025 16:19:08 -0400
Received: from mr3.vodafonemail.de ([145.253.228.163])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <jschmidt4gnu@HIDDEN>)
id 1uviKL-00028w-JW
for bug-gnu-emacs@HIDDEN; Mon, 08 Sep 2025 16:19:07 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vodafonemail.de;
s=vfde-mb-mr2-23sep; t=1757362731;
bh=Glspfb9g9onu79wku8s+hdW6nxs7A1yITC1qoaPjVrc=;
h=Message-ID:Date:User-Agent:From:Content-Language:To:Subject:
Content-Type:From;
b=Ktl+HLv3sJ2xOb1aT58ExRGraSnyLj27KYBh1btKMqxcDtLpBshr+81gmaT1qUcjc
zkHvaSUh0L7FNWfDFUOHjn9dY2P37X38YELGDlXG+X7GrpHzemVzu6aZV4kGWQcuSK
Xy79lsEQgiFdRRp1ApFfBPS4U3M5cuvX7k7dNH6Q=
Received: from smtp.vodafone.de (unknown [10.0.0.2])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by mr3.vodafonemail.de (Postfix) with ESMTPS id 4cLJF714qrz2GSW
for <bug-gnu-emacs@HIDDEN>; Mon, 8 Sep 2025 20:18:51 +0000 (UTC)
Received: from [192.168.1.45] (unknown [87.90.44.210])
(using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by smtp.vodafone.de (Postfix) with ESMTPSA id 4cLJF25QYFz8sXQ
for <bug-gnu-emacs@HIDDEN>; Mon, 8 Sep 2025 20:18:43 +0000 (UTC)
Message-ID: <5489a341-7d7a-408d-8166-d450a23b86ee@HIDDEN>
Date: Mon, 8 Sep 2025 22:18:43 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
From: Jens Schmidt <jschmidt4gnu@HIDDEN>
Content-Language: de-DE-frami, en-US
To: bug-gnu-emacs@HIDDEN
Subject: 31.0.50; describe-package does not show :readme after package
installation, but sth else
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-purgate-type: clean
X-purgate: clean
X-purgate-size: 6052
X-purgate-ID: 155817::1757362726-F4DDC014-AD3EFEF8/0/0
Received-SPF: pass client-ip=145.253.228.163;
envelope-from=jschmidt4gnu@HIDDEN; helo=mr3.vodafonemail.de
X-Spam_score_int: -27
X-Spam_score: -2.8
X-Spam_bar: --
X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001,
RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
X-Debbugs-Cc: Philip Kaludercic <philipk@HIDDEN>
Move your `package-user-dir' temporarily away. Then start "./src/emacs
-Q". Then:
M-x package-initialize RET
M-x package-list-packages RET
C-h P beframe RET
This shows the README.md as package description, as defined by
Prots through property :readme:
# Beframe (beframe.el) for GNU Emacs
`beframe` enables a frame-oriented Emacs workflow where each frame has
access to the list of buffers visited therein. In the interest of
brevity, we call buffers that belong to frames "beframed".
**Video demo:** <https://protesilaos.com/codelog/2023-02-28-emacs-beframe-demo/>
+ Package name (GNU ELPA): `beframe`
+ Official manual: <https://protesilaos.com/emacs/beframe>
+ Change log: <https://protesilaos.com/emacs/beframe-changelog>
+ Git repositories:
+ GitHub: <https://github.com/protesilaos/beframe>
+ GitLab: <https://gitlab.com/protesilaos/beframe>
+ Backronym: Buffers Encapsulated in Frames Realise Advanced
Management of Emacs.
Then:
M-x package-install beframe RET
C-h P beframe RET
Now this shows the README.org file as package description, which
in that place is ... ugly. I am aware of the following comment
in function `package--get-description':
;; We don’t include README.md here, because that is often the home
;; page on a site like github, and not suitable as the package long
;; description.
But probably if a package author has willfully designed her/his
README.md to be used as property :readme, then it should also be
used for installed packages [1]? Probably if there is a :readme
property, then function `package--get-description' should even
always use that, and not resort to guessing [2]?
If you agree and want me to provide a patch to that effect ([1]
or [2]?), please let me know.
[ I'm filing/asking this because I have been planning to use a
combination of (:readme "README.md" :doc "README.org") similar
to what Prots has been doing for his beframe package. ]
In GNU Emacs 31.0.50 (build 6, x86_64-pc-linux-gnu, GTK+ Version
3.24.38, cairo version 1.16.0) of 2025-09-08 built on sappc2
Repository revision: 4c74b68fb1f23db6ba770f7322efe378f3492751
Repository branch: master
Windowing system distributor 'The X.Org Foundation', version 11.0.12201009
System Description: Debian GNU/Linux 12 (bookworm)
Configured using:
'configure --with-native-compilation --with-mailutils'
Configured features:
ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG
LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT MODULES NATIVE_COMP
NOTIFY INOTIFY PDUMPER PNG RSVG SECCOMP SOUND THREADS TIFF
TOOLKIT_SCROLL_BARS WEBP X11 XDBE XIM XINERAMA XINPUT2 XPM XRANDR GTK3
ZLIB
Important settings:
value of $LC_COLLATE: POSIX
value of $LC_TIME: POSIX
value of $LANG: en_US.UTF-8
value of $XMODIFIERS: @im=ibus
locale-coding-system: utf-8-unix
Major mode: Lisp Interaction
Minor modes in effect:
tooltip-mode: t
global-eldoc-mode: t
eldoc-mode: t
show-paren-mode: t
electric-indent-mode: t
mouse-wheel-mode: t
tool-bar-mode: t
menu-bar-mode: t
file-name-shadow-mode: t
global-font-lock-mode: t
font-lock-mode: t
blink-cursor-mode: t
minibuffer-regexp-mode: t
line-number-mode: t
indent-tabs-mode: t
transient-mark-mode: t
auto-composition-mode: t
auto-encryption-mode: t
auto-compression-mode: t
Load-path shadows:
None found.
Features:
(shadow sort mail-extr emacsbug transient pcase format-spec edmacro
kmacro warnings info beframe-autoloads easy-mmode loaddefs-gen tar-mode
arc-mode archive-mode novice cus-edit pp cus-start cus-load wid-edit
lisp-mnt misearch multi-isearch cl-extra cl-print help-fns radix-tree
help-mode mm-archive message sendmail yank-media dired dired-loaddefs
rfc822 mml mml-sec epa derived gnus-util time-date mailabbrev gmm-utils
mailheader mm-decode mm-bodies mm-encode mail-utils mule-util gnutls
network-stream url-cache url-http url-auth mail-parse rfc2231 rfc2047
rfc2045 mm-util ietf-drums mail-prsvr url-gw nsm puny epg rfc6068
epg-config display-line-numbers compile text-property-search comint
ansi-osc ansi-color ring comp-run comp-common rx finder-inf thingatpt
package browse-url xdg url url-proxy url-privacy url-expand url-methods
url-history url-cookie generate-lisp-file url-domsuf url-util mailcap
url-handlers url-parse auth-source cl-seq eieio eieio-core cl-macs icons
password-cache json subr-x map byte-opt gv bytecomp byte-compile
url-vars cl-loaddefs cl-lib rmc iso-transl tooltip cconv eldoc paren
electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel
term/x-win x-win term/common-win x-dnd touch-screen tool-bar dnd fontset
image regexp-opt fringe tabulated-list replace newcomment text-mode
lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch
easymenu timer select scroll-bar mouse jit-lock font-lock syntax
font-core term/tty-colors frame minibuffer nadvice seq simple cl-generic
indonesian philippine cham georgian utf-8-lang misc-lang vietnamese
tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek
romanian slovak czech european ethiopic indian cyrillic chinese
composite emoji-zwj charscript charprop case-table epa-hook
jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs
theme-loaddefs faces cus-face macroexp files window text-properties
overlay sha1 md5 base64 format env code-pages mule custom widget keymap
hashtable-print-readable backquote threads dbusbind inotify lcms2
dynamic-setting system-font-setting font-render-setting cairo gtk
x-toolkit xinput2 x multi-tty move-toolbar make-network-process
tty-child-frames native-compile emacs)
Memory information:
((conses 16 348941 46086) (symbols 48 13566 0) (strings 32 67396 5547)
(string-bytes 1 1770646) (vectors 16 33740)
(vector-slots 8 746562 66527) (floats 8 61 158)
(intervals 56 25221 0) (buffers 984 16))
Jens Schmidt <jschmidt4gnu@HIDDEN>:philipk@HIDDEN, bug-gnu-emacs@HIDDEN.
Full text available.philipk@HIDDEN, bug-gnu-emacs@HIDDEN:bug#79411; Package emacs.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.