From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Ioannis Kappas Newsgroups: gmane.emacs.bugs Subject: bug#48137: 27.2; `package-install-file' fails when loading a package file with DOS line endings Date: Thu, 6 May 2021 07:55:52 +0100 Message-ID: References: <834kfmabvs.fsf@gnu.org> <83tunj651i.fsf@gnu.org> <83lf8u68bu.fsf@gnu.org> <83mtta4gtf.fsf@gnu.org> <83fsz24f2x.fsf@gnu.org> <83v97x2xum.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8562"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 48137@debbugs.gnu.org, Stefan Monnier To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu May 06 08:57:10 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 1leXwb-00025d-Jl for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 06 May 2021 08:57:09 +0200 Original-Received: from localhost ([::1]:60112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leXwa-00021k-Mh for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 06 May 2021 02:57:08 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:54328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leXwU-00021H-Lc for bug-gnu-emacs@gnu.org; Thu, 06 May 2021 02:57:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:53561) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1leXwU-0004T2-E8 for bug-gnu-emacs@gnu.org; Thu, 06 May 2021 02:57:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1leXwU-0001bA-Bq for bug-gnu-emacs@gnu.org; Thu, 06 May 2021 02:57:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Ioannis Kappas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 06 May 2021 06:57: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.16202841746125 (code B ref 48137); Thu, 06 May 2021 06:57:02 +0000 Original-Received: (at 48137) by debbugs.gnu.org; 6 May 2021 06:56:14 +0000 Original-Received: from localhost ([127.0.0.1]:36874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1leXvh-0001aj-2f for submit@debbugs.gnu.org; Thu, 06 May 2021 02:56:14 -0400 Original-Received: from mail-ot1-f45.google.com ([209.85.210.45]:37787) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1leXvb-0001ad-Sj for 48137@debbugs.gnu.org; Thu, 06 May 2021 02:56:11 -0400 Original-Received: by mail-ot1-f45.google.com with SMTP id c8-20020a9d78480000b0290289e9d1b7bcso4035403otm.4 for <48137@debbugs.gnu.org>; Wed, 05 May 2021 23:56:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=0pUoE8IrHwnxh31MJikoHMgWyVdZiuYEacWoY3zfA0E=; b=NSRY/TQAPZsQAvTpOYDhlRZIpQY5NOGLzI9KEOD47ufPyC49utOBNoic+VWzSwBxoq Pm9Kp40/cgQrQD/mNeJC9Zfp/zj0hX+cIpScRC7YEQ5qNB9DuQtgUy9cuqG15+awKdlQ llmq5kKyzYBUd6NNRSQXBme0w7O2NIKVYYf9NCo8XN7n7LB8kuxzsPF2zueGtPp9WTKO lgOqokbSVJj1V8xBmwQXXE1kZ3UH2NCKbmAMd/fWlEvCES1PsEQoqh5fsgZoqESOGU83 TOA60yYMjWdAjsD09LqGqhYvUSskb1pvZiABKCRNwfEKru49RA2f41smlr1ZoNwaAChI rL8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=0pUoE8IrHwnxh31MJikoHMgWyVdZiuYEacWoY3zfA0E=; b=WG1vTXv8O+atJkiLXzVo/v5gzy8t+UWVF7U48cdzTRj4y7Y0n8Z25py0+jCWlLSS9s U4fjhcVMd3QiMhyMagLe691dAT/UlERWdR9pz3E95jg0xSalGz3Y5iIH3CZSvETN8hIO FfDKGIXpa5yIU0WTjHA/U8WuhMZsDBXtN/aHwDxXu4hW0OeRmGJP9HyiRkY/W0lHnWfa Yp9Lw19sm5Oqcb13tLF/H5JYRn9UlzPGf9BGZ61uO5u8EyPNtWwjsmtmfTmsTQlqpw8a RoByN2NHmPxLRXAF5Gutb/1RcHGt1wX5nEHc8ZXdDvHnkfxnoxIouzfTZiML+CQDSDMN sHyg== X-Gm-Message-State: AOAM5331UVKDU24PnuqemostI5JWXwqxbw/zDOUkSr6jSyUZk2IUEQHj cBH41Ik64P04mBcBQrXg+/Xzl0zps+1bYFiNPvk= X-Google-Smtp-Source: ABdhPJzisA51bUhPjMn4sSIzM2fkmLY+OomlXZ0f5YblWXPVedQywYcVZzeTZrpm/Y+7F8/oxxg7hoUyVWmVLxuFymk= X-Received: by 2002:a9d:2de1:: with SMTP id g88mr2419128otb.5.1620284162179; Wed, 05 May 2021 23:56:02 -0700 (PDT) In-Reply-To: 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:205751 Archived-At: On Wed, May 5, 2021 at 1:01 PM Eli Zaretskii wrote: > > > From: Ioannis Kappas > > Date: Wed, 5 May 2021 08:03:17 +0100 > > Cc: Stefan Monnier , 48137@debbugs.gnu.org > > > > Currently, `package-install-file' reads the package contents into a > > buffer and calls `package-install-from-buffer' to parse the headers, > > download & install its dependencies, and finally install the package > > itself from the buffer. > > > > Just to confirm, what we are discussing as a solution (at a high > > level) is to parse the package headers from a decoded buffer, download > > & install its dependencies, and copy/extract the package file to the > > elpa user dir? > > My idea was to read the file literally, without decoding, then parse > the package headers from that. I suppose you mean something along the other option below? > > > Another solution could be to upgrade the 'lisp-mnt package to ignore > > ?\r characters. Looking at the `lm-header' fn invoked by > > `package-buffer-info', it does have a list of characters to stop at > > when looking for a header, we can thus add the carriage return to the > > list: > > > > diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el > > index 9cba232e16..3eb493d286 100644 > > --- a/lisp/emacs-lisp/lisp-mnt.el > > +++ b/lisp/emacs-lisp/lisp-mnt.el > > @@ -267,7 +267,7 @@ lm-header > > (if (save-excursion > > (skip-chars-backward "^$" (match-beginning 0)) > > (= (point) (match-beginning 0))) > > - "[^\n]+" "[^$\n]+"))) > > + "[^\n\r]+" "[^$\n\r]+"))) > > This is better, but IMO the code should be rewritten not to allow a > lone CR character, only either a lone LF or the CRLF pair. Thanks