From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 10 13:52:10 2024 Received: (at submit) by debbugs.gnu.org; 10 Feb 2024 18:52:10 +0000 Received: from localhost ([127.0.0.1]:33236 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYsSQ-0003Yb-1C for submit@debbugs.gnu.org; Sat, 10 Feb 2024 13:52:10 -0500 Received: from lists.gnu.org ([2001:470:142::17]:41452) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rYsSM-0003Xu-OJ for submit@debbugs.gnu.org; Sat, 10 Feb 2024 13:52:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rYsS1-00026J-Ej for bug-gnu-emacs@gnu.org; Sat, 10 Feb 2024 13:51:45 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rYsRz-00027T-6e for bug-gnu-emacs@gnu.org; Sat, 10 Feb 2024 13:51:45 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id BC88B5C00A2 for ; Sat, 10 Feb 2024 13:51:38 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sat, 10 Feb 2024 13:51:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=stebalien.com; h=cc:content-type:content-type:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:subject:subject:to:to; s=fm2; t=1707591098; x=1707677498; bh=TBh6/s5Ye42xXY9inHK3rjFtgQHPyEvd fx672KecAJM=; b=jzvixFK65hLJy2WN3FAyXUN61MNXUGSbbuOHvIemdSz3P9ki Pywg8Dufe5fTbj+OTQFtrFnfkeo6WioW8g6g9pOShxVzVieOeRwHY/eP9yA9yXNy 4YFEpqs9JS5nGka8Id6IiyqTQnA4kLCB9cfpPye9VbiNbTFlRgjamiS86LaPEMxC pmRsQDd+bG0HOZ60TUIRN+5r8uLV9aKuBO6/3MrBpSHfJTfQy8BhL3FxhIByzfJe IJDZjjTYTwpfmRa+1Tk8qGYF4Ao5INyFYBd28GjtmYRMkBJtWGPVmtmxydVD/q9a ISlVenylfc/2TdWRlJ0/97WDlmLgtXPTtbXzrQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:message-id :mime-version:reply-to:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1707591098; x=1707677498; bh=TBh6/s5Ye42xXY9inHK3rjFtgQHPyEvdfx6 72KecAJM=; b=EVrceIomAgMpzLnjL79grJGC2jtwxGQTT38hQAxZOIcoalMDR3t D8Rc7GjFgsIMrAfeLmIjyl0lRfVPCD/8b62zbPpxVeQQC2po3sx4LJJGXf4Miui7 DiXtsRQGUyNNLLGNDM3YeEldt+G+eJNsgz2Z7ZZfspIiMEh4EcigOzdtQlAg2Bhw g9Af2hys6Iz8acr21SQowpupEPs+PuQThuFOOv5LF5U1dlm5RoR5Vfj01d6dGBVg tK4xWLkacdvIqWasy4s4/UtFaGsgeI/484Ew7V/5rRuxf/08c7jaRUh74GWHLtL9 o6htdT2xJtog6jSuhKwuU6YVcGRoNhFe4MA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrtdelgdelvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkfggtgesmhdtreertddttd enucfhrhhomhepufhtvghvvghnucetlhhlvghnuceoshhtvghvvghnsehsthgvsggrlhhi vghnrdgtohhmqeenucggtffrrghtthgvrhhnpeekffffgfevteehtdeiffelffegkedvie eigeehfedtteejkeefhfevtddtkeefffenucevlhhushhtvghrufhiiigvpedtnecurfgr rhgrmhepmhgrihhlfhhrohhmpehsthgvvhgvnhesshhtvggsrghlihgvnhdrtghomh X-ME-Proxy: Feedback-ID: ie8a146a7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sat, 10 Feb 2024 13:51:38 -0500 (EST) From: Steven Allen To: bug-gnu-emacs@gnu.org Subject: [PATCH] package-vc: scan the correct directory for lisp files Date: Sat, 10 Feb 2024 10:51:36 -0800 Message-ID: <87ttmgp2yv.fsf@stebalien.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=66.111.4.27; envelope-from=steven@stebalien.com; helo=out3-smtp.messagingengine.com 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) --=-=-= Content-Type: text/plain Following up on my previous patch (Bug#68761), we need to scan for package requirements inside the lisp-dir (if set), not in the root package directory. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-package-vc-scan-the-correct-directory-for-lisp-files.patch >From 5a4540756e5e30d12010ce58094aafacc1b8fe01 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Sat, 10 Feb 2024 10:05:11 -0800 Subject: [PATCH] package-vc: scan the correct directory for lisp files Otherwise, we won't correctly detect package requirements. * lisp/emacs-lisp/package-vc.el (package-vc--unpack-1): Scan 'lisp-dir', if set, for lisp files instead of scanning the root package directory. --- lisp/emacs-lisp/package-vc.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index fc402716dab..2730100b3d0 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el @@ -501,8 +501,9 @@ package-vc--unpack-1 autoloads, generating a package description file (used to identify a package as a VC package later on), building documentation and marking the package as installed." - (let ((pkg-spec (package-vc--desc->spec pkg-desc)) - missing) + (let* ((pkg-spec (package-vc--desc->spec pkg-desc)) + (lisp-dir (plist-get pkg-spec :lisp-dir)) + missing) ;; In case the package was installed directly from source, the ;; dependency list wasn't know beforehand, and they might have @@ -519,7 +520,7 @@ package-vc--unpack-1 "\\|") regexp-unmatchable)) (deps '())) - (dolist (file (directory-files pkg-dir t "\\.el\\'" t)) + (dolist (file (directory-files (file-name-concat pkg-dir lisp-dir) t "\\.el\\'" t)) (unless (string-match-p ignored-files file) (with-temp-buffer (insert-file-contents file) @@ -542,8 +543,7 @@ package-vc--unpack-1 (pkg-file (expand-file-name (package--description-file pkg-dir) pkg-dir))) ;; Generate autoloads (let* ((name (package-desc-name pkg-desc)) - (auto-name (format "%s-autoloads.el" name)) - (lisp-dir (plist-get pkg-spec :lisp-dir))) + (auto-name (format "%s-autoloads.el" name))) (package-generate-autoloads name (file-name-concat pkg-dir lisp-dir)) (when lisp-dir -- 2.43.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 11 07:54:07 2024 Received: (at 69019) by debbugs.gnu.org; 11 Feb 2024 12:54:07 +0000 Received: from localhost ([127.0.0.1]:45419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZ9LS-0005Zq-M1 for submit@debbugs.gnu.org; Sun, 11 Feb 2024 07:54:07 -0500 Received: from mout01.posteo.de ([185.67.36.65]:55723) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZ9LQ-0005Z8-IW for 69019@debbugs.gnu.org; Sun, 11 Feb 2024 07:54:05 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 21D61240029 for <69019@debbugs.gnu.org>; Sun, 11 Feb 2024 13:48:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707655689; bh=XwWEU3U3Wcgj1B+aVQye06PlxzmOlhpvIgxIgDBKoaE=; h=From:To:Cc:Subject:Autocrypt:Date:Message-ID:MIME-Version: Content-Type:From; b=j7zj/7vix+Eg63rypSTbH7srdS1FeDe+RQTFpQtEHGqJr+466MnTQr7WUzrgauIAS rcZIYGzC17lBWczU5o/YFKeAZuJ1GbM+JMWncqJB4BotW5Aju9JFm2F9BbpPe9gPUC ZtxXgqAwRvv1dZvT46wKcuZAspfHkN2O0evqIyKUV5CiCWbBEnFj1TEfr7IbxQi4e4 F6rKgCRQI+1nkjZQTtpv4TMcagwuFaETalwmN7DQmBC/1MyBJfOOfEwMCTOD4yf8Yc tzT/8+SkcDq180H0Atw9IHX7/omEEn6IwSwBuibuHuiuXHvRCxn0Pf+pcm7/xWT6z/ 1hI2T1oPJZ+iA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TXnSS5CBHz9rxD; Sun, 11 Feb 2024 13:48:08 +0100 (CET) From: Philip Kaludercic To: Steven Allen Subject: Re: bug#69019: [PATCH] package-vc: scan the correct directory for lisp files In-Reply-To: <87ttmgp2yv.fsf@stebalien.com> (Steven Allen's message of "Sat, 10 Feb 2024 10:51:36 -0800") References: <87ttmgp2yv.fsf@stebalien.com> X-Hashcash: 1:20:240211:69019@debbugs.gnu.org::TlXNW4R35Q/ypBgQ:X9U X-Hashcash: 1:20:240211:steven@stebalien.com::JNa8nVyWzOdY2PXk:5Sb Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM Date: Sun, 11 Feb 2024 12:48:08 +0000 Message-ID: <87zfw7xj3r.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 69019 Cc: 69019@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Steven Allen writes: > Following up on my previous patch (Bug#68761), we need to scan for > package requirements inside the lisp-dir (if set), not in the root > package directory. Looks good, do you have any specific examples where this caused problems? >>>From 5a4540756e5e30d12010ce58094aafacc1b8fe01 Mon Sep 17 00:00:00 2001 > From: Steven Allen > Date: Sat, 10 Feb 2024 10:05:11 -0800 > Subject: [PATCH] package-vc: scan the correct directory for lisp files > > Otherwise, we won't correctly detect package requirements. > > * lisp/emacs-lisp/package-vc.el (package-vc--unpack-1): > Scan 'lisp-dir', if set, for lisp files instead of scanning the root > package directory. Just note that the convention of the commit message logs is not to indent the lines here. I can take care of that. > --- > lisp/emacs-lisp/package-vc.el | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el > index fc402716dab..2730100b3d0 100644 > --- a/lisp/emacs-lisp/package-vc.el > +++ b/lisp/emacs-lisp/package-vc.el > @@ -501,8 +501,9 @@ package-vc--unpack-1 > autoloads, generating a package description file (used to > identify a package as a VC package later on), building > documentation and marking the package as installed." > - (let ((pkg-spec (package-vc--desc->spec pkg-desc)) > - missing) > + (let* ((pkg-spec (package-vc--desc->spec pkg-desc)) > + (lisp-dir (plist-get pkg-spec :lisp-dir)) > + missing) > > ;; In case the package was installed directly from source, the > ;; dependency list wasn't know beforehand, and they might have > @@ -519,7 +520,7 @@ package-vc--unpack-1 > "\\|") > regexp-unmatchable)) > (deps '())) > - (dolist (file (directory-files pkg-dir t "\\.el\\'" t)) > + (dolist (file (directory-files (file-name-concat pkg-dir lisp-dir) t "\\.el\\'" t)) > (unless (string-match-p ignored-files file) > (with-temp-buffer > (insert-file-contents file) > @@ -542,8 +543,7 @@ package-vc--unpack-1 > (pkg-file (expand-file-name (package--description-file pkg-dir) pkg-dir))) > ;; Generate autoloads > (let* ((name (package-desc-name pkg-desc)) > - (auto-name (format "%s-autoloads.el" name)) > - (lisp-dir (plist-get pkg-spec :lisp-dir))) > + (auto-name (format "%s-autoloads.el" name))) > (package-generate-autoloads > name (file-name-concat pkg-dir lisp-dir)) > (when lisp-dir -- Philip Kaludercic From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 12 12:41:57 2024 Received: (at 69019) by debbugs.gnu.org; 12 Feb 2024 17:41:57 +0000 Received: from localhost ([127.0.0.1]:45038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZaJV-0004lM-UF for submit@debbugs.gnu.org; Mon, 12 Feb 2024 12:41:57 -0500 Received: from mout01.posteo.de ([185.67.36.141]:42839) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZaJR-0004kS-AV for 69019@debbugs.gnu.org; Mon, 12 Feb 2024 12:41:53 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 71B22240027 for <69019@debbugs.gnu.org>; Mon, 12 Feb 2024 18:39:55 +0100 (CET) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TYWtg0FBzz9rxP for <69019@debbugs.gnu.org>; Mon, 12 Feb 2024 18:39:54 +0100 (CET) Resent-To: 69019@debbugs.gnu.org Resent-From: Philip Kaludercic Resent-Date: Mon, 12 Feb 2024 18:39:54 +0100 Resent-Message-ID: <878r3p37kl.fsf@posteo.net> Received: from proxy02.posteo.name ([127.0.0.1]) by dovecot15.posteo.name (Dovecot) with LMTP id /zNVM19FyWVo+AAAB3Nl4w for ; Sun, 11 Feb 2024 23:46:55 +0100 Received: from proxy02.posteo.de ([127.0.0.1]) by proxy02.posteo.name (Dovecot) with LMTP id Syu1NPtNyWWChAIAGFAyLg ; Sun, 11 Feb 2024 23:46:55 +0100 Received: from mailin01.posteo.de (unknown [10.0.0.61]) by proxy02.posteo.de (Postfix) with ESMTPS id 4TY2lL6y9Nz120b for ; Sun, 11 Feb 2024 23:46:54 +0100 (CET) Received: from mx01.posteo.de (mailin01.posteo.de [127.0.0.1]) by mailin01.posteo.de (Postfix) with ESMTPS id E024B2155F for ; Sun, 11 Feb 2024 23:46:54 +0100 (CET) X-Posteo-Spam-Status: v=1; e=base64; a=aes-256-gcm; d=/wns2KwiXLd0MGT2Sz2eIvdrHDJKQ6Ru8LDn3SNZZ8oNmHnizw7fSvvP6+VTzBZqNUVleg45/ NEQV+jjm1C9gd7Rn9oBv1l7JixPA6FmbbrCCwGeHljZAgoPd9IlinCAN4x9p8ujvVaEvsithQGS LhMAnTCfMYyOtQG55uLrZjq5lJulX+iW1BnRy89BzhKaisAteu8VUXRiZis3l9atn0UrG/Y4fGE vyaiKN1MAwwyvyOzwl7Sv2VgnmxGotMmSlkFKpkjsTQlM3DHd3wEGF8fKr5an/6F8TMFgW2qguI Ow0fsgRJLgsLFmIBCXUf8pzj1C8ajkPL3VD0/sVsZWucrt2D/KUpZSYmFW5I1xv/d0bpxyKgRJx A== X-Posteo-Antispam-Signature: v=1; e=base64; a=aes-256-gcm; d=NyUYq5woj6zlruSf/iSoaxdeFpuyrXVrjurNwx95tOH4Kwigd40UZed4mjGQl6ZGq6QZHk5BjWetMRmUiFUbILlFJYr8KwpM930eq8Qzy8qBbPQ0D9RJMNlM5QNgS8q9Kxa2mMXX Authentication-Results: posteo.de; dkim=pass (2048-bit key) header.d=stebalien.com header.i=@stebalien.com header.b=eDsP2Bnt; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=ALyZeAUT; dkim-atps=neutral X-Posteo-TLS-Received-Status: TLSv1.3 Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by mx01.posteo.de (Postfix) with ESMTPS id 4TY2lL1tbMz11QL for ; Sun, 11 Feb 2024 23:46:54 +0100 (CET) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 0E3C45C0096 for ; Sun, 11 Feb 2024 17:46:53 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sun, 11 Feb 2024 17:46:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=stebalien.com; h=cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1707691613; x=1707778013; bh=Lg1KhLDJHf h+HjT/BmSVPcJpXnJqhmIERsxj9x4mWh4=; b=eDsP2BntGwVprcZG3gJboJRV/D LPaYkrIV8I1EymAP2B5BCdIuSkXNG4yc5Cngp9sIqmSHBPPaUMAzdE7FTzKpOWCx HOa82Azy31/QWZYSFt9K3ovbTqbDzg0aZVMxQKyvE71K1QK6sUcUMYaFscLtCAmq gruQLVMRVV0bZPF3XIz+z26Dar6X3rPnz9cCDNuzMkjeSn7UfOfeTseBzqDZ6IJI dnw0I6tfqPPezo6HteM0XyYWJM+BJkEOVfvSnOYzWwrrQQwhNX6Jf+DRxtunPT+O 7RIpiBwzJzagXHseTQgnb84Go6QCIcH1d1ykzOV4npoWmQBbjgn1/rej3j7w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1707691613; x=1707778013; bh=Lg1KhLDJHfh+HjT/BmSVPcJpXnJq hmIERsxj9x4mWh4=; b=ALyZeAUTbkn+hEIRKJBtBofqStvBk7RKMACilL+MMAEg 9HyrMFG0bjtvtRvfWkf8bGHVeiYA3l1GgCa8uiQXNGEniE1nDWo5uPWF25xudtSa snvV4HzrQIZofyTBoQ91vSFgPvCAy3odWmA8NEnfCrvK2yeTCELE8nTa+FOE2mOH OUAAikalJd6Yh9u8BsvFch3NYtfU7O/xNhXFwbhKhaWY8raY8WgOmqnSYqJZ+af0 d2/fzyBa/cZK2FyTei2YvKGDuGh/aInEAGZEGSQiQYksnIottLpYjkSQF1xxF9Oz npiM5JG9ZKhtJ93Cj0T9Z8+eS8NL4Ju+7Y6xR9bfJg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddvgddtvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffujghffffkgggtsehttdertddttddtnecuhfhrohhmpefuthgvvhgvnhcu tehllhgvnhcuoehsthgvvhgvnhesshhtvggsrghlihgvnhdrtghomheqnecuggftrfgrth htvghrnhepgfffteffiefhgeduueehtdeilefggeefgeehgfevgeetvdeutdfggfevheeu hfefnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsthgvvhgvnhesshhtvggsrghlihgvnhdr tghomh X-ME-Proxy: Feedback-ID: ie8a146a7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sun, 11 Feb 2024 17:46:52 -0500 (EST) From: Steven Allen To: Philip Kaludercic Subject: Re: bug#69019: [PATCH] package-vc: scan the correct directory for lisp files In-Reply-To: <87zfw7xj3r.fsf@posteo.net> References: <87ttmgp2yv.fsf@stebalien.com> <87zfw7xj3r.fsf@posteo.net> Date: Sun, 11 Feb 2024 22:46:51 +0000 Message-ID: <875xyu39gk.fsf@stebalien.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -1.7 (-) X-Debbugs-Envelope-To: 69019 Cc: 69019@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.7 (--) >> Following up on my previous patch (Bug#68761), we need to scan for >> package requirements inside the lisp-dir (if set), not in the root >> package directory. > > Looks good, do you have any specific examples where this caused > problems? pdf-tools puts all its files in a "lisp" dir, so they weren't getting searched when scanning for dependencies. The package definition is: (:url "https://github.com/vedang/pdf-tools/pulls" :lisp-dir "lisp") This patch causes package-vc to scan for dependencies in elisp files in "$pkg-dir/lisp/", instead of looking for elisp files in "$pkg-dir/". >> * lisp/emacs-lisp/package-vc.el (package-vc--unpack-1): >> Scan 'lisp-dir', if set, for lisp files instead of scanning the root >> package directory. > > Just note that the convention of the commit message logs is not to > indent the lines here. I can take care of that. I did not, thanks! From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 12 12:46:31 2024 Received: (at 69019) by debbugs.gnu.org; 12 Feb 2024 17:46:31 +0000 Received: from localhost ([127.0.0.1]:45300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZaNw-00057L-D8 for submit@debbugs.gnu.org; Mon, 12 Feb 2024 12:46:31 -0500 Received: from mout02.posteo.de ([185.67.36.66]:55533) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZaNr-00056E-J7 for 69019@debbugs.gnu.org; Mon, 12 Feb 2024 12:46:27 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 9A86D240103 for <69019@debbugs.gnu.org>; Mon, 12 Feb 2024 18:46:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707759960; bh=kQ1IYF2Ily9gRI7B6+FRpdSSSeL05rFPauCG7VBKd30=; h=From:To:Cc:Subject:Autocrypt:OpenPGP:Date:Message-ID:MIME-Version: Content-Type:From; b=D+Fsp8Tp1pR+lN18qXWyMIa7EsLg052Cl6peRXrMA/ACqVnklWN9uctj2p/fbjVAA 1qy3s3Z2RrL9uxB3oUrsPTqrWsGVCWQOB0TuodcZm6mQqzuyVeMdyde1sFsvg6DcWr A6p8ygD4td+E7MIm4HNdQeyZ1jjvbAgA2do33TwneDuPsNFLLz4FiCCaz1vikAou3g HC93DcpTfncgQQtSF795PfYkj+ekuEvgtMJYyVq1nieDOSzmhVWhIriNJlUFsz/Z3K UAjpnHPbVuR5iOBpbIYByak4ObmCzOt8n5v4o/WCcjNMUasBLKhOwV1kSG9U875csN lqVs0D7ElgERg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TYX1h12JGz6txL; Mon, 12 Feb 2024 18:45:59 +0100 (CET) From: Philip Kaludercic To: Steven Allen Subject: Re: bug#69019: [PATCH] package-vc: scan the correct directory for lisp files In-Reply-To: <875xyu39gk.fsf@stebalien.com> (Steven Allen's message of "Sun, 11 Feb 2024 14:46:51 -0800") References: <87ttmgp2yv.fsf@stebalien.com> <87zfw7xj3r.fsf@posteo.net> <875xyu39gk.fsf@stebalien.com> Autocrypt: addr=philipk@posteo.net; 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: Mon, 12 Feb 2024 17:45:59 +0000 Message-ID: <8734tx37ag.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 69019 Cc: 69019@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain (Don't forget to keep the bug tracker in the CC's; I have resent your message so that everything remains in the archives) Steven Allen writes: >>> Following up on my previous patch (Bug#68761), we need to scan for >>> package requirements inside the lisp-dir (if set), not in the root >>> package directory. >> >> Looks good, do you have any specific examples where this caused >> problems? > > pdf-tools puts all its files in a "lisp" dir, so they weren't getting > searched when scanning for dependencies. The package definition is: > > (:url "https://github.com/vedang/pdf-tools/pulls" > :lisp-dir "lisp") > > This patch causes package-vc to scan for dependencies in elisp files in > "$pkg-dir/lisp/", instead of looking for elisp files in "$pkg-dir/". OK, I have slightly modified the commit, can you check if it still works for you: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Respect-lisp-dir-whilst-scanning-for-VC-package-depe.patch >From 4758889a51bbc87a330bf21c89745a7b49597119 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Sat, 10 Feb 2024 10:05:11 -0800 Subject: [PATCH] Respect :lisp-dir whilst scanning for VC package dependencies * lisp/emacs-lisp/package-vc.el (package-vc--unpack-1): Scan 'lisp-dir', if set, for lisp files instead of scanning the root package directory. (Bug#69019) --- lisp/emacs-lisp/package-vc.el | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index fc402716dab..37980c28b02 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el @@ -501,8 +501,10 @@ package-vc--unpack-1 autoloads, generating a package description file (used to identify a package as a VC package later on), building documentation and marking the package as installed." - (let ((pkg-spec (package-vc--desc->spec pkg-desc)) - missing) + (let* ((pkg-spec (package-vc--desc->spec pkg-desc)) + (lisp-dir (plist-get pkg-spec :lisp-dir)) + (lisp-path (file-name-concat pkg-dir lisp-dir)) + missing) ;; In case the package was installed directly from source, the ;; dependency list wasn't know beforehand, and they might have @@ -519,7 +521,7 @@ package-vc--unpack-1 "\\|") regexp-unmatchable)) (deps '())) - (dolist (file (directory-files pkg-dir t "\\.el\\'" t)) + (dolist (file (directory-files lisp-path t "\\.el\\'" t)) (unless (string-match-p ignored-files file) (with-temp-buffer (insert-file-contents file) @@ -542,10 +544,8 @@ package-vc--unpack-1 (pkg-file (expand-file-name (package--description-file pkg-dir) pkg-dir))) ;; Generate autoloads (let* ((name (package-desc-name pkg-desc)) - (auto-name (format "%s-autoloads.el" name)) - (lisp-dir (plist-get pkg-spec :lisp-dir))) - (package-generate-autoloads - name (file-name-concat pkg-dir lisp-dir)) + (auto-name (format "%s-autoloads.el" name))) + (package-generate-autoloads name lisp-path) (when lisp-dir (write-region (with-temp-buffer -- 2.43.0 --=-=-= Content-Type: text/plain >>> * lisp/emacs-lisp/package-vc.el (package-vc--unpack-1): >>> Scan 'lisp-dir', if set, for lisp files instead of scanning the root >>> package directory. >> >> Just note that the convention of the commit message logs is not to >> indent the lines here. I can take care of that. > > I did not, thanks! --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 12 13:16:34 2024 Received: (at 69019) by debbugs.gnu.org; 12 Feb 2024 18:16:34 +0000 Received: from localhost ([127.0.0.1]:47079 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZar3-0007Ot-Cl for submit@debbugs.gnu.org; Mon, 12 Feb 2024 13:16:33 -0500 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:53969) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rZaqw-0007Nu-Tj for 69019@debbugs.gnu.org; Mon, 12 Feb 2024 13:16:31 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.west.internal (Postfix) with ESMTP id 4CED43200AC5; Mon, 12 Feb 2024 13:07:57 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Mon, 12 Feb 2024 13:07:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=stebalien.com; h=cc:cc:content-type:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1707761276; x= 1707847676; bh=LMJe28anx7sJTr+vi4bEvoGRXcJ8x0WOIWjYZDWBthQ=; b=I heNAW2n2Z6YYSTV9q1guEKqAbjNLqVWCWtkEqsAgIEoSc7/e3MTxOuwukCala93v 9l24bUuP1fmRBuhpZQNg2PIXqOoMY8cBrE86vY3TwVtqJ3IJIdwlno4JrDYA0Zi0 EZKVQM2XnogDYzWF+1klx0iMLtyih5ckTutCTmjTYey0sFMbKrbFI8QRBZeJTV8m +JnLXYVIz9PYEJZdSXJ852wy74kBX1TLe5RfKSg84yHSSP3nn9DCCM133ShPsm36 dfOYKDwRhv3JUIyGC05bmPHrOQ0LjZffqjwFpcXdgtyW6WS1cSnX1tPJWo80Jh91 eUSlWJeq0IWbJm7vSJhig== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1707761276; x=1707847676; bh=LMJe28anx7sJTr+vi4bEvoGRXcJ8 x0WOIWjYZDWBthQ=; b=TFCCeA+GF8dGaxlwnlSprr6GR9u0dgBew8htmV+/w3z0 q30tcsKrZqFEBgqpuA2Ajv0F3lTgPuyd1HEJ582N4TGIHbH99uTo16/GyNO7OuqX A4Y4DpSpFBozJlgm2D04GioU6E4Xig/ihV+VD57n6i0Gcx2XaUalp8sS4bQP2rz/ wP+E6soy6VQXe53cRET8F/ue+25FuBPmuZcLSkHY1TBu8oIgtFIDoJp06lhnN2lo udsmltA2sxSVWX3kn2z1d5gcWDS7viUntDLt0H8BCa/bh5UupclkgnYGtrZoI/fY 5tKPcey8ldkuvvABKgqb4hYKrIgFb8SQvlI9//k0KA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudefgddutdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefujghffffkgggtsehttdertddttddtnecuhfhrohhmpefuthgvvhgv nhcutehllhgvnhcuoehsthgvvhgvnhesshhtvggsrghlihgvnhdrtghomheqnecuggftrf grthhtvghrnhepvdekheekgeelheehgefgudelkeethffhgfeuffetkeegtddvfeduuddt tdejjedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epshhtvghvvghnsehsthgvsggrlhhivghnrdgtohhm X-ME-Proxy: Feedback-ID: ie8a146a7:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 12 Feb 2024 13:07:56 -0500 (EST) From: Steven Allen To: Philip Kaludercic Subject: Re: bug#69019: [PATCH] package-vc: scan the correct directory for lisp files In-Reply-To: <8734tx37ag.fsf@posteo.net> References: <87ttmgp2yv.fsf@stebalien.com> <87zfw7xj3r.fsf@posteo.net> <875xyu39gk.fsf@stebalien.com> <8734tx37ag.fsf@posteo.net> Date: Mon, 12 Feb 2024 10:07:55 -0800 Message-ID: <871q9h7dz8.fsf@stebalien.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 69019 Cc: 69019@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Philip Kaludercic writes: > OK, I have slightly modified the commit, can you check if it still works > for you: Tested and confirmed working. And thanks for CCing the list. From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 13 16:08:03 2024 Received: (at 69019-done) by debbugs.gnu.org; 13 Feb 2024 21:08:03 +0000 Received: from localhost ([127.0.0.1]:47971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ra00Z-0008AV-2K for submit@debbugs.gnu.org; Tue, 13 Feb 2024 16:08:03 -0500 Received: from mout02.posteo.de ([185.67.36.66]:53423) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ra00W-00089Y-Dg for 69019-done@debbugs.gnu.org; Tue, 13 Feb 2024 16:08:01 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 1F8B3240104 for <69019-done@debbugs.gnu.org>; Tue, 13 Feb 2024 22:07:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707858456; bh=4DJrasusRUplGYVaNFiEMexnAmJDRJmC5AEQ5/DNMXI=; h=From:To:Cc:Subject:OpenPGP:Date:Message-ID:MIME-Version: Content-Type:From; b=S5OqPV9/4FgkbZUCiVjqIfE776DRbaWyuPL0QFOcd4cVEhvTYpCiMCJ77feqaVRTI JZzk04JtK9hrj0VNjiTzT6noCnE72FiIOOB9QKJhgBMJNf87kl6+8cejP6Q/AxLzUW DMd3NQjVnx3Fwcg0wvnWax3rgyVvO2KGkx5uz2ft0vzG2G0gZLwPXW0f9239X+zQjY rC5exjFeF+XHQmVPzEDtfLVwi2TPG6DNkubqb6Bggws8JPVf+G0HGlOUnDuulXFtQF Vukqfq0VDe4E6vttP6EFBSInRvZGJMuQDpYUREtLV7y3Yrz7Hy0Av3JR6uQRM2Ix0Y V+QqiOAxgykPA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TZDRq3RGmz6tyZ; Tue, 13 Feb 2024 22:07:35 +0100 (CET) From: Philip Kaludercic To: Steven Allen Subject: Re: bug#69019: [PATCH] package-vc: scan the correct directory for lisp files In-Reply-To: <871q9h7dz8.fsf@stebalien.com> (Steven Allen's message of "Mon, 12 Feb 2024 10:07:55 -0800") References: <87ttmgp2yv.fsf@stebalien.com> <87zfw7xj3r.fsf@posteo.net> <875xyu39gk.fsf@stebalien.com> <8734tx37ag.fsf@posteo.net> <871q9h7dz8.fsf@stebalien.com> OpenPGP: id=7126E1DE2F0CE35C770BED01F2C3CC513DB89F66; url="https://keys.openpgp.org/vks/v1/by-fingerprint/7126E1DE2F0CE35C770BED01F2C3CC513DB89F66"; preference=signencrypt Date: Tue, 13 Feb 2024 21:07:34 +0000 Message-ID: <87plx05azt.fsf@posteo.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 69019-done Cc: 69019-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Steven Allen writes: > Philip Kaludercic writes: >> OK, I have slightly modified the commit, can you check if it still works >> for you: > > Tested and confirmed working. And thanks for CCing the list. OK, I'll push that then under your name and close this bug report. Thank you for your help! From unknown Mon Aug 18 08:27:05 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 13 Mar 2024 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator