From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id Avb3MR4UXl/eVAAA0tVLHw (envelope-from ) for ; Sun, 13 Sep 2020 12:44:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id qOxJKx4UXl/oTQAAbx9fmQ (envelope-from ) for ; Sun, 13 Sep 2020 12:44:14 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 18A68940539 for ; Sun, 13 Sep 2020 12:44:13 +0000 (UTC) Received: from localhost ([::1]:43404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHRMa-0005YW-VY for larch@yhetil.org; Sun, 13 Sep 2020 08:44:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHRMQ-0005Xn-Af for guix-patches@gnu.org; Sun, 13 Sep 2020 08:44:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38110) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHRMQ-0002FZ-1P for guix-patches@gnu.org; Sun, 13 Sep 2020 08:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kHRMQ-0007DA-01 for guix-patches@gnu.org; Sun, 13 Sep 2020 08:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43249] Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Sep 2020 12:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43249 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Prafulla Giri Cc: Andreas Enge , 43249@debbugs.gnu.org Received: via spool by 43249-submit@debbugs.gnu.org id=B43249.160000101227677 (code B ref 43249); Sun, 13 Sep 2020 12:44:01 +0000 Received: (at 43249) by debbugs.gnu.org; 13 Sep 2020 12:43:32 +0000 Received: from localhost ([127.0.0.1]:49656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHRLv-0007CK-Mp for submit@debbugs.gnu.org; Sun, 13 Sep 2020 08:43:31 -0400 Received: from mout-p-103.mailbox.org ([80.241.56.161]:63496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHRLt-0007C6-9n for 43249@debbugs.gnu.org; Sun, 13 Sep 2020 08:43:30 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4Bq8L311PnzKmVl; Sun, 13 Sep 2020 14:43:23 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1600000999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=50zWKIK3tONiIzapLLtCdKnld09WVvKfBbqvSbZnGBM=; b=LIqaTUrkNHbctD/Ys9eDuxueHqwkFwBgXe6k9H8ehi8AGKklcV5l0R7g5oy7II7opOdskv DQOUze8IaE4orU2vxoXded/qMZwbEOvn5tfkZXsFFUMeHFti7R8cewSuyom38vTnulcc93 Aje4n/i6BTYDW9j3VlR2uunmPGLs8VVKjDqKHVwL3qOZgg0hrDclEMmjkctix/tixat7hO uc7P9e8GXkGrO5EE6AnW+Z2vhAQnkhBB3RfO39wpKnHZ4tOojtQX0/JIuy2WsttaftX2FW L7Y/q2KJuhbcAkIfYA+d/SSW1icseqmcn2GN5aVSUUqoLENX28Zkwi5f2OyFLw== Received: from smtp1.mailbox.org ([80.241.60.240]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id GGgqqGPGBLRz; Sun, 13 Sep 2020 14:43:17 +0200 (CEST) References: From: Brendan Tildesley Message-ID: Date: Sun, 13 Sep 2020 22:43:27 +1000 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/alternative; boundary="------------AABFCF0CE2F18ECFDB157F22" Content-Language: en-US X-MBO-SPAM-Probability: X-Rspamd-Score: -2.06 / 15.00 / 15.00 X-Rspamd-Queue-Id: DDCDA14E4 X-Rspamd-UID: 746e69 X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=brendan.scot header.s=MBO0001 header.b=LIqaTUrk; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 1.49 X-TUID: LJt9gSwhB16/ This is a multi-part message in MIME format. --------------AABFCF0CE2F18ECFDB157F22 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 8/9/20 10:22 pm, Prafulla Giri wrote: > I see. > > Yes, it does make sense now why you chose to replace the 'wrap phase. > > I wonder.... perhaps it'd be better altogether if the (wrap-program) > procedure could be re-written to not make ..*.real.real programs...? > That would save us a lot of code-duplication... I have come to understand wrap-program a little better and I realised your patch could have actually been fixed in a better way than I did. The issue is with the part of your code that runs (find-files "." ".*") This is what matches all the .calibre-real files If instead of that, it was: (find-files "." (lambda (file stat) (not (wrapper? file)))) or (find-files "." (lambda (file stat) (not (string-prefix "." (basename file)))) It should avoid double wrapping. An even simpler way would have been to use (add-before 'wrap ..., instead of (add-after 'wrap ... If you are still interested, feel free to make a patch overwriting mine to use this more correct method, instead of where i duplicated the wrap PYTHONPATH bit. The fact that this happened is a bug though. I created some patches I think fix this for core-updates. It would have made your original patch error and force you to fix it: https://issues.guix.gnu.org/43367 --------------AABFCF0CE2F18ECFDB157F22 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 7bit
On 8/9/20 10:22 pm, Prafulla Giri wrote:
I see.

Yes, it does make sense now why you chose to replace the 'wrap phase.

I wonder.... perhaps it'd be better altogether if the (wrap-program) procedure could be re-written to not make ..*.real.real programs...? That would save us a lot of code-duplication...

I have come to understand wrap-program a little better and I realised your patch could have actually been fixed in a better way than I did. The issue is with the part of your code that runs


(find-files "." ".*")


This is what matches all the .calibre-real files

If instead of that, it was:

(find-files "." (lambda (file stat) (not (wrapper? file))))

or

(find-files "." (lambda (file stat) (not (string-prefix "." (basename file))))

It should avoid double wrapping. An even simpler way would have been to use (add-before 'wrap ..., instead of (add-after 'wrap ...

If you are still interested, feel free to make a patch overwriting mine to use this more correct method, instead of where i duplicated the wrap PYTHONPATH bit.

The fact that this happened is a bug though. I created some patches I think fix this for core-updates. It would have made your original patch error and force you to fix it: https://issues.guix.gnu.org/43367


  


--------------AABFCF0CE2F18ECFDB157F22--