From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#48137: 27.2; `package-install-file' fails when loading a package file with DOS line endings Date: Mon, 03 May 2021 16:12:17 -0400 Message-ID: References: <834kfmabvs.fsf@gnu.org> <83tunj651i.fsf@gnu.org> <83r1in645l.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="1264"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Ioannis Kappas , 48137@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon May 03 22:13:11 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ldewI-0000CW-On for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 03 May 2021 22:13:10 +0200 Original-Received: from localhost ([::1]:40490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldewH-0005xy-Pg for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 03 May 2021 16:13:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldewA-0005xS-Im for bug-gnu-emacs@gnu.org; Mon, 03 May 2021 16:13:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:36916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ldewA-0005jM-BB for bug-gnu-emacs@gnu.org; Mon, 03 May 2021 16:13:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ldewA-0004jp-5H for bug-gnu-emacs@gnu.org; Mon, 03 May 2021 16:13:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 03 May 2021 20:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48137 X-GNU-PR-Package: emacs Original-Received: via spool by 48137-submit@debbugs.gnu.org id=B48137.162007274618192 (code B ref 48137); Mon, 03 May 2021 20:13:02 +0000 Original-Received: (at 48137) by debbugs.gnu.org; 3 May 2021 20:12:26 +0000 Original-Received: from localhost ([127.0.0.1]:48460 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldeva-0004jM-Ge for submit@debbugs.gnu.org; Mon, 03 May 2021 16:12:26 -0400 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:16591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldevZ-0004j7-2u for 48137@debbugs.gnu.org; Mon, 03 May 2021 16:12:25 -0400 Original-Received: from pmg3.iro.umontreal.ca (localhost [127.0.0.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 9D72F440818; Mon, 3 May 2021 16:12:19 -0400 (EDT) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg3.iro.umontreal.ca (Proxmox) with ESMTP id 604484407DF; Mon, 3 May 2021 16:12:18 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1620072738; bh=WzXytOVbf2TdUzM+JGd1aWhu8tShK3fcN1ujUi6ad4w=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=eILV/fgZ5c8ThHO/9NyrHN4j6j4DAPj+B0WGP9jnjvQ4v225spqmN5DQcvDYkp/dc ivk85QPSp7Bdwqu7BnirvdQYyu3jO6Z0Bo3usvDrEcyb/9KFUmEhZqwxAtmf7h67hK 8t+xM7xT2iAxuYVhjb7uCXbDDxuf13Axqu2OLHfZs01+I9ExWSuPNHaUmiYCtBSzzs hUHZeB0AG5ANwF0yLzYZI+pfLVWEPtvyXE+p+55G/Cf8wdO9+ARmPBANXF817vSSmx fp217mS2rJijgPmIMAhQXmDN8y5pH5jTPZ30Wa+3CL3FEJaQYrXAc9jpmAv3Yf4TYQ e2EhBlTAI/uRg== Original-Received: from alfajor (unknown [108.161.125.61]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id 30DE2120267; Mon, 3 May 2021 16:12:18 -0400 (EDT) In-Reply-To: <83r1in645l.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 03 May 2021 21:52:38 +0300") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:205559 Archived-At: >> If not, I would like to suggest a slightly >> updated patch that is targeting .el files directly as an exemption: >> >> diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el >> index ecb2573cab..19ab0445b9 100644 >> --- a/lisp/emacs-lisp/package.el >> +++ b/lisp/emacs-lisp/package.el >> @@ -2147,7 +2147,9 @@ package-install-file >> (progn >> (setq default-directory file) >> (dired-mode)) >> - (insert-file-contents-literally file) >> + (if (string-match "\\.el\\'" file) >> + (insert-file-contents file) >> + (insert-file-contents-literally file)) >> (when (string-match "\\.tar\\'" file) (tar-mode))) >> (package-install-from-buffer))) > > is not something I can endorse, especially as it decodes much more > than just the EOL format. package.el should do *some* decoding because it needs to look at the pseudo-headers in the file to generate the `-pkg.el` which contains among other things the package's short description. Admittedly, these will usually work OK in undecoded buffers as well, but not in all cases. Stefan