From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 08 21:31:40 2018 Received: (at submit) by debbugs.gnu.org; 9 Jul 2018 01:31:40 +0000 Received: from localhost ([127.0.0.1]:51572 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcL1c-0002FH-Mt for submit@debbugs.gnu.org; Sun, 08 Jul 2018 21:31:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56443) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcL1b-0002F3-Ch for submit@debbugs.gnu.org; Sun, 08 Jul 2018 21:31:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fcL1V-0003gA-C1 for submit@debbugs.gnu.org; Sun, 08 Jul 2018 21:31:30 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_40,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:46735) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fcL1V-0003g4-7n for submit@debbugs.gnu.org; Sun, 08 Jul 2018 21:31:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcL1U-0003sx-4j for guix-patches@gnu.org; Sun, 08 Jul 2018 21:31:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fcL1Q-0003ea-1n for guix-patches@gnu.org; Sun, 08 Jul 2018 21:31:28 -0400 Received: from [2001:19f0:5:274f:351:616f:fec3:2694] (port=55924 helo=vultr.systemreboot.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fcL1P-0003dG-Eh for guix-patches@gnu.org; Sun, 08 Jul 2018 21:31:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=32AilQXH0oRS6rF6r9Ql0re1B1kEPgZAJMBXPLwLZtY=; b=hcvequ8Ue42bDIDe3qcbilxU+n sfFLdlV+TWmwbx8GdvQgiuqdgb3iqifczCL3bqAKA38BN+pxyY9/ILEGO1ZF1+UW4IdyC7FA2gYcJ n/FTxCZzsoA09RdKN7OQltlp3mWTaHkoX2xeXmegwT3LVJGZwYnOYuCyegFENHNPtlRY=; Received: from [103.194.23.253] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.91) (envelope-from ) id 1fcKyB-0004Rl-3l; Mon, 09 Jul 2018 06:58:03 +0530 From: Arun Isaac To: guix-patches@gnu.org Subject: [PATCH] utils: Fix wrap-program filename generation. Date: Mon, 9 Jul 2018 07:01:03 +0530 Message-Id: <20180709013103.26091-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.15.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit Cc: Arun Isaac 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: -5.1 (-----) * guix/build/utils.scm (wrap-program): While generating a new filename for the wrapped program, trim dots from the left of the basename. This prevents already wrapped files being wrapped again with two or more dots prepended to them. --- guix/build/utils.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index c58a1afd1..0794c658f 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2015, 2018 Mark H Weaver +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -1032,7 +1033,8 @@ modules in $GUILE_LOAD_PATH, etc. If PROG has previously been wrapped by 'wrap-program', the wrapper is extended with definitions for VARS." (define wrapped-file - (string-append (dirname prog) "/." (basename prog) "-real")) + (string-append + (dirname prog) "/." (string-trim (basename prog) #\.) "-real")) (define already-wrapped? (file-exists? wrapped-file)) -- 2.15.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 09 03:35:15 2018 Received: (at 32102) by debbugs.gnu.org; 9 Jul 2018 07:35:15 +0000 Received: from localhost ([127.0.0.1]:51678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcQhX-0002E3-9M for submit@debbugs.gnu.org; Mon, 09 Jul 2018 03:35:15 -0400 Received: from mail.lassieur.org ([83.152.10.219]:40358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcQhV-0002Dv-Ej for 32102@debbugs.gnu.org; Mon, 09 Jul 2018 03:35:13 -0400 Received: from rodion (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id b0b0a850 (TLSv1.2:ECDHE-RSA-CHACHA20-POLY1305:256:NO); Mon, 9 Jul 2018 07:35:12 +0000 (UTC) References: <20180709013103.26091-1-arunisaac@systemreboot.net> User-agent: mu4e 1.0; emacs 26.1 From: =?utf-8?Q?Cl=C3=A9ment?= Lassieur To: Arun Isaac Subject: Re: [bug#32102] [PATCH] utils: Fix wrap-program filename generation. In-reply-to: <20180709013103.26091-1-arunisaac@systemreboot.net> Date: Mon, 09 Jul 2018 09:35:11 +0200 Message-ID: <87k1q4j1zk.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32102 Cc: 32102@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.0 (-) Hi Arun, Arun Isaac writes: > * guix/build/utils.scm (wrap-program): While generating a new filename fo= r the > wrapped program, trim dots from the left of the basename. This prevents > already wrapped files being wrapped again with two or more dots prepended= to > them. Why is it a problem that two or more dots are prepended to them? It means that 'foo' and '.foo' will have the same generated file name '.foo-real'. Wrapping a hidden file and its non-hidden counterpart is something that probably shouldn't happen, but if for some reason it must happen, we'll face an annoying bug. WDYT? Cl=C3=A9ment From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 09 06:49:30 2018 Received: (at 32102) by debbugs.gnu.org; 9 Jul 2018 10:49:30 +0000 Received: from localhost ([127.0.0.1]:51748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcTjW-0006tr-Ig for submit@debbugs.gnu.org; Mon, 09 Jul 2018 06:49:30 -0400 Received: from vultr.systemreboot.net ([45.77.148.100]:49218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcTjU-0006te-Qb for 32102@debbugs.gnu.org; Mon, 09 Jul 2018 06:49:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; 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=KbY5FBjeKB0gEDKgBNKsF+sNWzO/gAxWRyQD9hk2Cf4=; b=K6So3hnndZNkv7UtNyjHoPtVE VSnZZz1eaBXecveEVC+8RdaBtRDcbCbnQko449tkt5lsmMUaTPY8lMeaaBVNqqIk+vW501rCgRflq kyEr/ZQ3GQVhbCRZ6OV35QApYWyUl7Y23z6AWF6vAtDXIkGjtlQRwYuVEMulfbw89Z/W4=; Received: from [103.194.21.115] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fcTgB-0003Rk-G5; Mon, 09 Jul 2018 16:16:03 +0530 From: Arun Isaac To: =?utf-8?Q?Cl=C3=A9ment?= Lassieur Subject: Re: [bug#32102] [PATCH] utils: Fix wrap-program filename generation. In-Reply-To: <87k1q4j1zk.fsf@lassieur.org> References: <20180709013103.26091-1-arunisaac@systemreboot.net> <87k1q4j1zk.fsf@lassieur.org> Date: Mon, 09 Jul 2018 16:19:15 +0530 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32102 Cc: 32102@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.0 (-) >> * guix/build/utils.scm (wrap-program): While generating a new filename for the >> wrapped program, trim dots from the left of the basename. This prevents >> already wrapped files being wrapped again with two or more dots prepended to >> them. > > Why is it a problem that two or more dots are prepended to them? (define (wrap-program prog #:rest vars) (define wrapped-file (string-append (dirname prog) "/." (basename prog) "-real")) (define already-wrapped? (file-exists? wrapped-file)) ...) If wrap-program finds that PROG has previously been wrapped, it extends the wrapper; it does not create a wrapper around the previously existing wrapper (a "double wrapper"). wrap-program detects that PROG has previously been wrapped by comparing the expected wrapped filename (see code snippet above). Without the string-trim I added, this already-wrapped? detection fails and a double wrapper ends up being created. For a concrete example of what I mean, look at the gajim package. You will find double wrappers such as "bin/..gajim-real-real". This shouldn't have happened. Furthermore, many other packages have similar issues. You might find some if you search through /gnu/store. find /gnu/store -name "*-real-real" > It means that 'foo' and '.foo' will have the same generated file name > '.foo-real'. Wrapping a hidden file and its non-hidden counterpart is > something that probably shouldn't happen, but if for some reason it must > happen, we'll face an annoying bug. WDYT? It's true that we could face an annoying bug in the future. But then, we'll have to find some alternative means to determine alread-wrapped?. Is that worth it? Any ideas? From debbugs-submit-bounces@debbugs.gnu.org Mon Jul 09 10:12:39 2018 Received: (at 32102) by debbugs.gnu.org; 9 Jul 2018 14:12:39 +0000 Received: from localhost ([127.0.0.1]:52531 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcWu5-0005Fk-CC for submit@debbugs.gnu.org; Mon, 09 Jul 2018 10:12:39 -0400 Received: from mail.lassieur.org ([83.152.10.219]:40368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcWu1-0005FY-MX for 32102@debbugs.gnu.org; Mon, 09 Jul 2018 10:12:34 -0400 Received: from newt (smtp.parrot.biz [62.23.167.188]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 2818cff1 (TLSv1.2:ECDHE-RSA-CHACHA20-POLY1305:256:NO); Mon, 9 Jul 2018 14:12:32 +0000 (UTC) References: <20180709013103.26091-1-arunisaac@systemreboot.net> <87k1q4j1zk.fsf@lassieur.org> User-agent: mu4e 1.0; emacs 26.1 From: =?utf-8?Q?Cl=C3=A9ment?= Lassieur To: Arun Isaac Subject: Re: [bug#32102] [PATCH] utils: Fix wrap-program filename generation. In-reply-to: Date: Mon, 09 Jul 2018 16:12:31 +0200 Message-ID: <87r2kc8pm8.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32102 Cc: 32102@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.0 (-) Arun Isaac writes: >>> * guix/build/utils.scm (wrap-program): While generating a new filename = for the >>> wrapped program, trim dots from the left of the basename. This prevents >>> already wrapped files being wrapped again with two or more dots prepend= ed to >>> them. >> >> Why is it a problem that two or more dots are prepended to them? > > (define (wrap-program prog #:rest vars) > (define wrapped-file > (string-append > (dirname prog) "/." (basename prog) "-real")) > > (define already-wrapped? > (file-exists? wrapped-file)) > > ...) > > If wrap-program finds that PROG has previously been wrapped, it extends > the wrapper; it does not create a wrapper around the previously existing > wrapper (a "double wrapper"). wrap-program detects that PROG has > previously been wrapped by comparing the expected wrapped filename (see > code snippet above). Without the string-trim I added, this > already-wrapped? detection fails and a double wrapper ends up being > created. If '.gajim-real' exists and (WRAP-PROGRAM '/path/to/gajim' ...) is called, PROG is '/path/to/gajim', WRAPPED-FILE is '/path/to/.gajim-real' and ALREADY-WRAPPED? is #t, so I don't think there is a bug with WRAP-PROGRAM. The ..gajim-real-real file comes from the WRAP procedure in python-build-system.scm: that WRAP procedure wraps every file it finds. It'll wrap '.gajim-real' and 'gajim'. Wrapping 'gajim' will work well, it will be modified because it's already a wrapper, i.e. '.gajim-real' exists. But wrapping '.gajim-real' will create '..gajim-real-real' because '.gajim-real' is not a wrapper. And I think it's normal too. So the question is: should WRAP (from python-build-system.scm) wrap files that already have a wrapper? I think it shouldn't. Cl=C3=A9ment From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 10 01:16:47 2018 Received: (at 32102) by debbugs.gnu.org; 10 Jul 2018 05:16:48 +0000 Received: from localhost ([127.0.0.1]:52957 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcl15-0004xe-Pk for submit@debbugs.gnu.org; Tue, 10 Jul 2018 01:16:47 -0400 Received: from vultr.systemreboot.net ([45.77.148.100]:56366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcl13-0004xP-86 for 32102@debbugs.gnu.org; Tue, 10 Jul 2018 01:16:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; 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=kKpf2mplrmncGPPVl5VFHGLHADplLI18LIFZ9LStaeY=; b=daRsTW1Eh4ggVi6unxxJrJbgl oBRTMqgE8qFvruM4BwS/m6SQCop8mesbh8PEI96cycQTRbDdc9sLddYkOkr2p91SVrbAfhYvNfHOi F232VGiaR8VPhEYEnmt8AU17GS5LuOWQf6NvY51mgH5mdO9W4rWM9ssFSMfqOl+QHqi2Y=; Received: from [14.139.128.14] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fckxj-0003pm-Lt; Tue, 10 Jul 2018 10:43:19 +0530 From: Arun Isaac To: =?utf-8?Q?Cl=C3=A9ment?= Lassieur Subject: Re: [bug#32102] [PATCH] utils: Fix wrap-program filename generation. In-Reply-To: <87r2kc8pm8.fsf@lassieur.org> References: <20180709013103.26091-1-arunisaac@systemreboot.net> <87k1q4j1zk.fsf@lassieur.org> <87r2kc8pm8.fsf@lassieur.org> Date: Tue, 10 Jul 2018 10:46:32 +0530 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32102 Cc: 32102@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.0 (-) > should WRAP (from python-build-system.scm) wrap files that already > have a wrapper? I think it shouldn't. I agree with your analysis. How about I send a patch modifying WRAP (from python-build-system) to only wrap non-hidden files (files whose name do not begin with a dot) in bin and sbin? From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 10 04:57:49 2018 Received: (at 32102) by debbugs.gnu.org; 10 Jul 2018 08:57:49 +0000 Received: from localhost ([127.0.0.1]:53034 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcoSz-0003bo-1v for submit@debbugs.gnu.org; Tue, 10 Jul 2018 04:57:49 -0400 Received: from mail.lassieur.org ([83.152.10.219]:40436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcoSx-0003bf-1V for 32102@debbugs.gnu.org; Tue, 10 Jul 2018 04:57:47 -0400 Received: from rodion (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 65677414 (TLSv1.2:ECDHE-RSA-CHACHA20-POLY1305:256:NO); Tue, 10 Jul 2018 08:57:45 +0000 (UTC) References: <20180709013103.26091-1-arunisaac@systemreboot.net> <87k1q4j1zk.fsf@lassieur.org> <87r2kc8pm8.fsf@lassieur.org> User-agent: mu4e 1.0; emacs 26.1 From: =?utf-8?Q?Cl=C3=A9ment?= Lassieur To: Arun Isaac Subject: Re: [bug#32102] [PATCH] utils: Fix wrap-program filename generation. In-reply-to: Date: Tue, 10 Jul 2018 10:57:44 +0200 Message-ID: <87h8l7ii2f.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32102 Cc: Mark H Weaver , Andreas Enge , 32102@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.0 (-) Arun Isaac writes: >> should WRAP (from python-build-system.scm) wrap files that already >> have a wrapper? I think it shouldn't. > > I agree with your analysis. How about I send a patch modifying WRAP > (from python-build-system) to only wrap non-hidden files (files whose > name do not begin with a dot) in bin and sbin? That sounds good, but I'm not a Python expert, and I don't know if there are cases where hidden files would need to be wrapped. I'm CCing Andreas and Mark because they know better than me. From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 10 14:14:28 2018 Received: (at 32102) by debbugs.gnu.org; 10 Jul 2018 18:14:28 +0000 Received: from localhost ([127.0.0.1]:54333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcx9g-0005k7-0q for submit@debbugs.gnu.org; Tue, 10 Jul 2018 14:14:28 -0400 Received: from world.peace.net ([64.112.178.59]:37926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fcx9d-0005jt-Ix for 32102@debbugs.gnu.org; Tue, 10 Jul 2018 14:14:26 -0400 Received: from mhw by world.peace.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1fcx9X-0001lW-Lp; Tue, 10 Jul 2018 14:14:19 -0400 From: Mark H Weaver To: =?utf-8?Q?Cl=C3=A9ment?= Lassieur Subject: Re: [bug#32102] [PATCH] utils: Fix wrap-program filename generation. References: <20180709013103.26091-1-arunisaac@systemreboot.net> <87k1q4j1zk.fsf@lassieur.org> <87r2kc8pm8.fsf@lassieur.org> <87h8l7ii2f.fsf@lassieur.org> Date: Tue, 10 Jul 2018 14:13:03 -0400 In-Reply-To: <87h8l7ii2f.fsf@lassieur.org> (=?utf-8?Q?=22Cl=C3=A9ment?= Lassieur"'s message of "Tue, 10 Jul 2018 10:57:44 +0200") Message-ID: <87bmbfyn68.fsf@netris.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32102 Cc: Arun Isaac , 32102@debbugs.gnu.org, Andreas Enge 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.0 (-) Cl=C3=A9ment Lassieur writes: > Arun Isaac writes: > >>> should WRAP (from python-build-system.scm) wrap files that already >>> have a wrapper? I think it shouldn't. >> >> I agree with your analysis. How about I send a patch modifying WRAP >> (from python-build-system) to only wrap non-hidden files (files whose >> name do not begin with a dot) in bin and sbin? Sure, sounds reasonable to me. > That sounds good, but I'm not a Python expert, and I don't know if there > are cases where hidden files would need to be wrapped. I'm CCing > Andreas and Mark because they know better than me. The change sounds good, but I think it can't be done on master because it would entail too many rebuilds. I can't tell you roughly how many, because as far as I know we don't have tooling to estimate the number of rebuilds from changing a build system, but I tried adding whitespace to python-build-system.scm and then running "guix system build -n " on my GNOME system and the answer was discouraging. So, I think this is probably a change for core-updates, or possibly for the next 'staging' cycle if we can come up with a better estimate of how many builds are needed. Thanks, Mark From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 11 15:27:36 2018 Received: (at 32102) by debbugs.gnu.org; 11 Jul 2018 19:27:36 +0000 Received: from localhost ([127.0.0.1]:55913 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdKlz-00089x-Uc for submit@debbugs.gnu.org; Wed, 11 Jul 2018 15:27:36 -0400 Received: from vultr.systemreboot.net ([45.77.148.100]:45072) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdKlw-00089a-3o for 32102@debbugs.gnu.org; Wed, 11 Jul 2018 15:27:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Message-Id:Date:Subject:Cc:To:From:Sender: Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=6RoI+BGRzmz7IiDp2D5FRi8Te2n7CPJdLan+//H+1T8=; b=cmGVK8DoJjzy+LitFnrRkem0mp azkCQAKDlG8XVT0+MZf4K2brhHxdebmt0uklAoK6rSnvWvo7W4vgI+jidIdsuADz8zBQg0jBgF2aS d2iuLzmoPSE9/5z5WlNKLIyaNYWwuBVWo2a5NT2hx9MVnuwYr+X1C9xk4IRcMBv5xVpw=; Received: from [124.40.246.228] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.91) (envelope-from ) id 1fdKiO-0001mF-EA; Thu, 12 Jul 2018 00:53:53 +0530 From: Arun Isaac To: clement@lassieur.org Subject: [PATCH v2 0/2] build-system: python: Only wrap non-hidden executable files Date: Thu, 12 Jul 2018 00:56:50 +0530 Message-Id: <20180711192652.20186-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.15.1 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32102 Cc: mhw@netris.org, Arun Isaac , 32102@debbugs.gnu.org, andreas@enge.fr 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.0 (-) Please find below the new patch. In addition, I have included another minor slightly related patch for the gajim package. Arun Isaac (2): build-system: python: Only wrap non-hidden executable files. gnu: gajim: Combine wrap-program phases. gnu/packages/messaging.scm | 35 ++++++++++++++++------------------- guix/build/python-build-system.scm | 7 ++++++- 2 files changed, 22 insertions(+), 20 deletions(-) -- 2.15.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 11 15:27:40 2018 Received: (at 32102) by debbugs.gnu.org; 11 Jul 2018 19:27:41 +0000 Received: from localhost ([127.0.0.1]:55915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdKm0-00089z-4t for submit@debbugs.gnu.org; Wed, 11 Jul 2018 15:27:40 -0400 Received: from vultr.systemreboot.net ([45.77.148.100]:45066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdKlv-00089Z-PC for 32102@debbugs.gnu.org; Wed, 11 Jul 2018 15:27:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To: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=zVP2lONGVRdwQDFQAUWEWUuDV4wBSaDE4oSxXSFXvaU=; b=U2e4fXfJqnWWHCIw2JX2cltonz XwkF2C8AT35H/1+rj75eGL8LPEh7MNFzn1+nGR4131tUT+NtwKCYE258IKYgJMesbrWxWB/Qui8vf fYJspGVOaUI/bn0JpCwr9+07Fw3s5AqNmcY3UFfLUA7j/fTJN5cBQP4nuUcLVi7BcZPY=; Received: from [124.40.246.228] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.91) (envelope-from ) id 1fdKiQ-0001mF-NI; Thu, 12 Jul 2018 00:53:54 +0530 From: Arun Isaac To: clement@lassieur.org Subject: [PATCH v2 2/2] gnu: gajim: Combine wrap-program phases. Date: Thu, 12 Jul 2018 00:56:52 +0530 Message-Id: <20180711192652.20186-3-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180711192652.20186-1-arunisaac@systemreboot.net> References: <20180711192652.20186-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32102 Cc: mhw@netris.org, Arun Isaac , 32102@debbugs.gnu.org, andreas@enge.fr 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.0 (-) * gnu/packages/messaging.scm (gajim)[arguments]: Combine wrap-program phases into a single wrap-gajim phase. --- gnu/packages/messaging.scm | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index cdcd1225f..89946a685 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Mekeor Melire -;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2017, 2018 Arun Isaac ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Rutger Helling @@ -586,17 +586,6 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each - (lambda (name) - (let ((file (string-append out "/bin/" name)) - (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) - (wrap-program file - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))) - '("gajim" "gajim-remote" "gajim-history-manager"))) - #t)) (add-before 'check 'remove-test-resolver ;; This test requires network access. (lambda _ @@ -628,14 +617,22 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") (symlink adwaita "Adwaita") (copy-recursively hicolor "hicolor"))) #t)) - (add-after 'install-icons 'wrap-program + (add-after 'install-icons 'wrap-gajim (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (string-append (assoc-ref outputs "out") - "/bin/gajim") - ;; For GtkFileChooserDialog. - `("GSETTINGS_SCHEMA_DIR" = - (,(string-append (assoc-ref inputs "gtk+") - "/share/glib-2.0/schemas"))))))))) + (let ((out (assoc-ref outputs "out"))) + (for-each + (lambda (name) + (let ((file (string-append out "/bin/" name)) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program file + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))) + '("gajim" "gajim-remote" "gajim-history-manager")) + (wrap-program (string-append out "/bin/gajim") + ;; For GtkFileChooserDialog. + `("GSETTINGS_SCHEMA_DIR" = + (,(string-append (assoc-ref inputs "gtk+") + "/share/glib-2.0/schemas"))))) + #t))))) (native-inputs `(("intltool" ,intltool) ("xorg-server" ,xorg-server))) -- 2.15.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 11 15:27:41 2018 Received: (at 32102) by debbugs.gnu.org; 11 Jul 2018 19:27:41 +0000 Received: from localhost ([127.0.0.1]:55918 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdKm4-0008AG-Uy for submit@debbugs.gnu.org; Wed, 11 Jul 2018 15:27:41 -0400 Received: from vultr.systemreboot.net ([45.77.148.100]:45092) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdKlz-00089g-RS for 32102@debbugs.gnu.org; Wed, 11 Jul 2018 15:27:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To: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=eGENnmGDA1lGwh2zK+OuFHYUPuyhDgdMrgS9YgUKpvE=; b=ZhpAsekK3AUWAJ1GobDteNbOrb 5bY3CiZHfFDTAu4svwDGXOiaGu4DcKVhwni7CJWLTkB8D9g5uF4SG65Ue+srM3LuSv3kWqJew0n1X RWtbty3gfC6tBXm3j2TupGF4dJasNF2n6NBaceRAv9TaiwHhi4JsMuto6CT/sb13hbfc=; Received: from [124.40.246.228] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.91) (envelope-from ) id 1fdKiQ-0001mF-3U; Thu, 12 Jul 2018 00:53:54 +0530 From: Arun Isaac To: clement@lassieur.org Subject: [PATCH v2 1/2] build-system: python: Only wrap non-hidden executable files. Date: Thu, 12 Jul 2018 00:56:51 +0530 Message-Id: <20180711192652.20186-2-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180711192652.20186-1-arunisaac@systemreboot.net> References: <20180711192652.20186-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32102 Cc: mhw@netris.org, Arun Isaac , 32102@debbugs.gnu.org, andreas@enge.fr 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.0 (-) * guix/build/python-build-system.scm (wrap): Only wrap non-hidden executable files. This prevents wrapped executables from being wrapped once again. --- guix/build/python-build-system.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 376ea81f1..37e35eec0 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2015, 2018 Mark H Weaver ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -189,7 +190,11 @@ when running checks after installing the package." (map (cut string-append dir "/" <>) (or (scandir dir (lambda (f) (let ((s (stat (string-append dir "/" f)))) - (eq? 'regular (stat:type s))))) + (and (eq? 'regular (stat:type s)) + ;; Only wrap non-hidden files. This + ;; prevents wrapped executables from being + ;; wrapped again. + (not (string-prefix? "." f)))))) '()))) (define bindirs -- 2.15.1 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 13 03:42:09 2018 Received: (at 32102) by debbugs.gnu.org; 13 Jul 2018 07:42:09 +0000 Received: from localhost ([127.0.0.1]:57626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdsiP-00005f-Ac for submit@debbugs.gnu.org; Fri, 13 Jul 2018 03:42:09 -0400 Received: from mail.lassieur.org ([83.152.10.219]:40696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdsiO-00005X-4H for 32102@debbugs.gnu.org; Fri, 13 Jul 2018 03:42:08 -0400 Received: from rodion (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id b53cc478 (TLSv1.2:ECDHE-RSA-CHACHA20-POLY1305:256:NO); Fri, 13 Jul 2018 07:42:03 +0000 (UTC) References: <20180711192652.20186-1-arunisaac@systemreboot.net> <20180711192652.20186-2-arunisaac@systemreboot.net> User-agent: mu4e 1.0; emacs 26.1 From: =?utf-8?Q?Cl=C3=A9ment?= Lassieur To: Arun Isaac Subject: Re: [PATCH v2 1/2] build-system: python: Only wrap non-hidden executable files. In-reply-to: <20180711192652.20186-2-arunisaac@systemreboot.net> Date: Fri, 13 Jul 2018 09:42:02 +0200 Message-ID: <87a7qvmvjp.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32102 Cc: mhw@netris.org, andreas@enge.fr, 32102@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.0 (-) Arun Isaac writes: > * guix/build/python-build-system.scm (wrap): Only wrap non-hidden executa= ble > files. This prevents wrapped executables from being wrapped once again. > --- > guix/build/python-build-system.scm | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/guix/build/python-build-system.scm b/guix/build/python-build= -system.scm > index 376ea81f1..37e35eec0 100644 > --- a/guix/build/python-build-system.scm > +++ b/guix/build/python-build-system.scm > @@ -5,6 +5,7 @@ > ;;; Copyright =C2=A9 2015, 2018 Mark H Weaver > ;;; Copyright =C2=A9 2016 Hartmut Goebel > ;;; Copyright =C2=A9 2018 Ricardo Wurmus > +;;; Copyright =C2=A9 2018 Arun Isaac > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -189,7 +190,11 @@ when running checks after installing the package." > (map (cut string-append dir "/" <>) > (or (scandir dir (lambda (f) > (let ((s (stat (string-append dir "/" f)))) > - (eq? 'regular (stat:type s))))) > + (and (eq? 'regular (stat:type s)) > + ;; Only wrap non-hidden files. This > + ;; prevents wrapped executables from = being > + ;; wrapped again. > + (not (string-prefix? "." f)))))) > '()))) >=20=20 > (define bindirs What about adding a function like 'is-wrapped?'? Because it could be used somewhere else, and it would make the code self-descriptive. It would check that the name looks like .xxx-real, and also check that xxx exists. (And check that it's an executable.) WDYT? Cl=C3=A9ment From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 13 04:36:12 2018 Received: (at 32102) by debbugs.gnu.org; 13 Jul 2018 08:36:12 +0000 Received: from localhost ([127.0.0.1]:57664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdtYi-0001Rq-Jz for submit@debbugs.gnu.org; Fri, 13 Jul 2018 04:36:12 -0400 Received: from vultr.systemreboot.net ([45.77.148.100]:59990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdtYg-0001Rd-OM for 32102@debbugs.gnu.org; Fri, 13 Jul 2018 04:36:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; 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=8U1cRJgfEmNnm8RR/YKYEzAFET4IsR2EC4p/2QMZw58=; b=OTuOPZ0bqWSwx/cYJU6AuxYfh iZiY7CjvU99zT7mnEnjw1JBxEj0WGp7fMIMg0cDXMW+C7/I7xrB1iWC525/bLuqlTo78VoW0CUWEE 55ZNPdCSHIoQYBZFA35kACy9B3IJgn+FNyla/C+sBtHCO2WspUuv5Glj1Gwu5l1kslino=; Received: from [103.61.74.63] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fdtVD-0000mD-35; Fri, 13 Jul 2018 14:02:35 +0530 From: Arun Isaac To: =?utf-8?Q?Cl=C3=A9ment?= Lassieur Subject: Re: [PATCH v2 1/2] build-system: python: Only wrap non-hidden executable files. In-Reply-To: <87a7qvmvjp.fsf@lassieur.org> References: <20180711192652.20186-1-arunisaac@systemreboot.net> <20180711192652.20186-2-arunisaac@systemreboot.net> <87a7qvmvjp.fsf@lassieur.org> Date: Fri, 13 Jul 2018 14:05:31 +0530 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32102 Cc: mhw@netris.org, andreas@enge.fr, 32102@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.0 (-) > What about adding a function like 'is-wrapped?'? Because it could be > used somewhere else, and it would make the code self-descriptive. > > It would check that the name looks like .xxx-real, and also check that > xxx exists. (And check that it's an executable.) Yes, that's a good idea. I'll add `is-wrapped?' to (guix build utils) and export it. That way, both `wrap-program' from (guix build utils) and the wrap phase from python-build-system can make use of it. I will send an updated patchset once I'm done. From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 13 04:39:01 2018 Received: (at 32102) by debbugs.gnu.org; 13 Jul 2018 08:39:01 +0000 Received: from localhost ([127.0.0.1]:57669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdtbQ-0001Vc-23 for submit@debbugs.gnu.org; Fri, 13 Jul 2018 04:39:01 -0400 Received: from mail.lassieur.org ([83.152.10.219]:40698) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdtbO-0001VT-6L for 32102@debbugs.gnu.org; Fri, 13 Jul 2018 04:38:59 -0400 Received: from newt (smtp.parrot.biz [62.23.167.188]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 53079260 (TLSv1.2:ECDHE-RSA-CHACHA20-POLY1305:256:NO); Fri, 13 Jul 2018 08:38:56 +0000 (UTC) References: <20180711192652.20186-1-arunisaac@systemreboot.net> <20180711192652.20186-3-arunisaac@systemreboot.net> User-agent: mu4e 1.0; emacs 26.1 From: =?utf-8?Q?Cl=C3=A9ment?= Lassieur To: Arun Isaac Subject: Re: [PATCH v2 2/2] gnu: gajim: Combine wrap-program phases. In-reply-to: <20180711192652.20186-3-arunisaac@systemreboot.net> Date: Fri, 13 Jul 2018 10:38:55 +0200 Message-ID: <87zhyv1qe8.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32102 Cc: mhw@netris.org, andreas@enge.fr, 32102@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.0 (-) Arun Isaac writes: > * gnu/packages/messaging.scm (gajim)[arguments]: Combine wrap-program pha= ses > into a single wrap-gajim phase. > --- > gnu/packages/messaging.scm | 35 ++++++++++++++++------------------- > 1 file changed, 16 insertions(+), 19 deletions(-) If the problem is that the phases have the same name, renaming one of them would be enough? I'm not sure it's worth merging them, given that they don't even apply to the same files. Cl=C3=A9ment From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 13 05:46:26 2018 Received: (at 32102) by debbugs.gnu.org; 13 Jul 2018 09:46:26 +0000 Received: from localhost ([127.0.0.1]:57725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdueg-00058m-4G for submit@debbugs.gnu.org; Fri, 13 Jul 2018 05:46:26 -0400 Received: from vultr.systemreboot.net ([45.77.148.100]:34018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fduef-00058V-4h for 32102@debbugs.gnu.org; Fri, 13 Jul 2018 05:46:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; 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=rAnFIVLqh19kdvCknmVyjslvLfx5XnTePAUW8X/sDnw=; b=M3oRQ8t6qgc1dSQXPIftoizh5 D1JHPxQLRhUJ5JY655Gmi+rnx+ggjVhyQiPAWLi3SBxOykYvpningVjnz6TkdgZhIrvVrnumsLYic gRpjvBz/wqKSjU9q+o6HMhY0IJqrVQUWFv8rW3/OixHk/9V6EFwm4wi8IdyHW/+R2szu4=; Received: from [103.61.74.63] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fdub4-0001UX-Fq; Fri, 13 Jul 2018 15:12:42 +0530 From: Arun Isaac To: =?utf-8?Q?Cl=C3=A9ment?= Lassieur Subject: Re: [PATCH v2 2/2] gnu: gajim: Combine wrap-program phases. In-Reply-To: <87zhyv1qe8.fsf@lassieur.org> References: <20180711192652.20186-1-arunisaac@systemreboot.net> <20180711192652.20186-3-arunisaac@systemreboot.net> <87zhyv1qe8.fsf@lassieur.org> Date: Fri, 13 Jul 2018 15:15:59 +0530 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32102 Cc: mhw@netris.org, andreas@enge.fr, 32102@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.0 (-) >> * gnu/packages/messaging.scm (gajim)[arguments]: Combine wrap-program phases >> into a single wrap-gajim phase. >> --- >> gnu/packages/messaging.scm | 35 ++++++++++++++++------------------- >> 1 file changed, 16 insertions(+), 19 deletions(-) > > If the problem is that the phases have the same name, renaming one of > them would be enough? I'm not sure it's worth merging them, given that > they don't even apply to the same files. Ok, I'll rename the phases to wrap-gi-typelib-path and wrap-gsettings-schema-dir respectively. From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 28 16:43:24 2018 Received: (at 32102) by debbugs.gnu.org; 28 Jul 2018 20:43:24 +0000 Received: from localhost ([127.0.0.1]:33080 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fjW3Z-0008LS-NI for submit@debbugs.gnu.org; Sat, 28 Jul 2018 16:43:24 -0400 Received: from vultr.systemreboot.net ([45.77.148.100]:44462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fjW3X-0008LC-7b for 32102@debbugs.gnu.org; Sat, 28 Jul 2018 16:43:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; 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=RqiCsZDTxs4VB0Toma38AuyUaBroVhqbDBiD1A5xdZo=; b=ITaWx6JVCY42zoyyNjEadXNHn X89nSKFvllxd5STwYb2NbkPH6YUvisCmZhn9jQBvQWdQrDAzSaonzUaldh+dBgZCOGhmtSDNCMdW4 stgNFhBbT6AIrQ4oByyOG2TC97trvgvJJzOViuFYV3CoVekYJiMo+LUIfcUBDav7AAdBw=; Received: from [192.168.2.1] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fjW3N-0003m1-OC; Sun, 29 Jul 2018 02:13:06 +0530 From: Arun Isaac To: =?utf-8?Q?Cl=C3=A9ment?= Lassieur Subject: Re: [PATCH v2 2/2] gnu: gajim: Combine wrap-program phases. In-Reply-To: References: <20180711192652.20186-1-arunisaac@systemreboot.net> <20180711192652.20186-3-arunisaac@systemreboot.net> <87zhyv1qe8.fsf@lassieur.org> Date: Sun, 29 Jul 2018 02:12:58 +0530 Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32102 Cc: 32102@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.0 (-) --=-=-= Content-Type: text/plain Please find attached the updated patches. Sorry this took so long. I was working on another project, and couldn't spare the computing time to build the whole system from scratch due to these patches. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=v3-0001-build-system-python-Do-not-double-wrap-executable.patch Content-Transfer-Encoding: quoted-printable >From 6ee5cf4423109ab64df58c85f4114e456dda098b Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Wed, 11 Jul 2018 13:03:33 +0530 Subject: [PATCH v3 1/3] build-system: python: Do not double wrap executable= s. To: clement@lassieur.org Cc: mhw@netris.org, andreas@enge.fr, 32102@debbugs.gnu.org * guix/build/python-build-system.scm (wrap): Only wrap executables that have not already been wrapped. * guix/build/utils.scm (is-wrapped?): New function. --- guix/build/python-build-system.scm | 9 ++++----- guix/build/utils.scm | 9 +++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-s= ystem.scm index 376ea81f1..05e5009a4 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -5,6 +5,7 @@ ;;; Copyright =C2=A9 2015, 2018 Mark H Weaver ;;; Copyright =C2=A9 2016 Hartmut Goebel ;;; Copyright =C2=A9 2018 Ricardo Wurmus +;;; Copyright =C2=A9 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -186,11 +187,9 @@ when running checks after installing the package." =20 (define* (wrap #:key inputs outputs #:allow-other-keys) (define (list-of-files dir) - (map (cut string-append dir "/" <>) - (or (scandir dir (lambda (f) - (let ((s (stat (string-append dir "/" f)))) - (eq? 'regular (stat:type s))))) - '()))) + (find-files dir (lambda (file stat) + (and (eq? 'regular (stat:type stat)) + (not (is-wrapped? file)))))) =20 (define bindirs (append-map (match-lambda diff --git a/guix/build/utils.scm b/guix/build/utils.scm index c58a1afd1..c310b792c 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -3,6 +3,7 @@ ;;; Copyright =C2=A9 2013 Andreas Enge ;;; Copyright =C2=A9 2013 Nikita Karetnikov ;;; Copyright =C2=A9 2015, 2018 Mark H Weaver +;;; Copyright =C2=A9 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +22,7 @@ =20 (define-module (guix build utils) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-2) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) @@ -87,6 +89,7 @@ patch-/usr/bin/file fold-port-matches remove-store-references + is-wrapped? wrap-program =20 invoke @@ -1003,6 +1006,12 @@ known as `nuke-refs' in Nixpkgs." (put-u8 out (char->integer char)) result)))))) =20 +(define (is-wrapped? prog) + "Return #t if PROG is already wrapped using wrap-program, else return #f= ." + (with-directory-excursion (dirname prog) + (and-let* ((match-record (string-match "^\\.(.*)-real$" (basename prog= )))) + (access? (match:substring match-record 1) X_OK)))) + (define* (wrap-program prog #:rest vars) "Make a wrapper for PROG. VARS should look like this: =20 --=20 2.18.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=v3-0002-gnu-gajim-Rename-wrap-program-phases.patch >From 1a1762da6e62d7bcf6556df300299d9cfc995d0f Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 28 Jul 2018 17:27:26 +0530 Subject: [PATCH v3 2/3] gnu: gajim: Rename wrap-program phases. To: clement@lassieur.org Cc: mhw@netris.org, andreas@enge.fr, 32102@debbugs.gnu.org * gnu/packages/messaging.scm (gajim)[arguments]: Rename wrap-program phases to wrap-gi-typelib-path and wrap-gsettings-schema-dir. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index a34f74465..0c6c2f642 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -586,7 +586,7 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'install 'wrap-program + (add-after 'install 'wrap-gi-typelib-path (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (for-each @@ -628,7 +628,7 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") (symlink adwaita "Adwaita") (copy-recursively hicolor "hicolor"))) #t)) - (add-after 'install-icons 'wrap-program + (add-after 'install-icons 'wrap-gsettings-schema-dir (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out") "/bin/gajim") -- 2.18.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=v3-0003-gnu-gajim-Return-t-from-wrap-gsettings-schema-dir.patch >From 71a7f6e39bd5b68b596bda2a75b1d245179349d0 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 28 Jul 2018 17:31:44 +0530 Subject: [PATCH v3 3/3] gnu: gajim: Return #t from wrap-gsettings-schema-dir phase. To: clement@lassieur.org Cc: mhw@netris.org, andreas@enge.fr, 32102@debbugs.gnu.org * gnu/packages/messaging.scm (gajim)[arguments]: Return #t from wrap-gsettings-schema-dir phase. --- gnu/packages/messaging.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 0c6c2f642..da0d28325 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -635,7 +635,8 @@ was initially a fork of xmpppy, but uses non-blocking sockets.") ;; For GtkFileChooserDialog. `("GSETTINGS_SCHEMA_DIR" = (,(string-append (assoc-ref inputs "gtk+") - "/share/glib-2.0/schemas"))))))))) + "/share/glib-2.0/schemas")))) + #t))))) (native-inputs `(("intltool" ,intltool) ("xorg-server" ,xorg-server))) -- 2.18.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 29 10:20:18 2018 Received: (at 32102) by debbugs.gnu.org; 29 Jul 2018 14:20:18 +0000 Received: from localhost ([127.0.0.1]:33972 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fjmYQ-0006Jd-KY for submit@debbugs.gnu.org; Sun, 29 Jul 2018 10:20:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fjmYO-0006JL-Jn for 32102@debbugs.gnu.org; Sun, 29 Jul 2018 10:20:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fjmYI-0006WV-5P for 32102@debbugs.gnu.org; Sun, 29 Jul 2018 10:20:07 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:40479) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjmYI-0006WR-1i; Sun, 29 Jul 2018 10:20:06 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48434 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fjmYH-0005Bu-2r; Sun, 29 Jul 2018 10:20:05 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Arun Isaac Subject: Re: [bug#32102] [PATCH v2 2/2] gnu: gajim: Combine wrap-program phases. References: <20180711192652.20186-1-arunisaac@systemreboot.net> <20180711192652.20186-3-arunisaac@systemreboot.net> <87zhyv1qe8.fsf@lassieur.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 11 Thermidor an 226 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 29 Jul 2018 16:20:03 +0200 In-Reply-To: (Arun Isaac's message of "Sun, 29 Jul 2018 02:12:58 +0530") Message-ID: <87y3dudsz0.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 32102 Cc: 32102@debbugs.gnu.org, =?utf-8?Q?Cl=C3=A9ment?= Lassieur 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: -6.0 (------) Hello Arun, I=E2=80=99m a bit late to the party, but hey! Arun Isaac skribis: > From 6ee5cf4423109ab64df58c85f4114e456dda098b Mon Sep 17 00:00:00 2001 > From: Arun Isaac > Date: Wed, 11 Jul 2018 13:03:33 +0530 > Subject: [PATCH v3 1/3] build-system: python: Do not double wrap executab= les. > To: clement@lassieur.org > Cc: mhw@netris.org, > andreas@enge.fr, > 32102@debbugs.gnu.org Hmm, weird! > * guix/build/python-build-system.scm (wrap): Only wrap executables that h= ave > not already been wrapped. > * guix/build/utils.scm (is-wrapped?): New function. [...] > --- a/guix/build/python-build-system.scm > +++ b/guix/build/python-build-system.scm [...] > (define* (wrap #:key inputs outputs #:allow-other-keys) > (define (list-of-files dir) > - (map (cut string-append dir "/" <>) > - (or (scandir dir (lambda (f) > - (let ((s (stat (string-append dir "/" f)))) > - (eq? 'regular (stat:type s))))) > - '()))) > + (find-files dir (lambda (file stat) > + (and (eq? 'regular (stat:type stat)) > + (not (is-wrapped? file)))))) Something I don=E2=80=99t get is that =E2=80=98wrap-program=E2=80=99 itself= is supposed to detect already-wrapped program. I vaguely remember discussing it before but I forgot what the conclusions were; do we really need extra =E2=80=98wrapped?=E2=80=99 checks? Can=E2=80=99t we fix =E2=80=98wrap-prog= ram=E2=80=99 itself? > (define bindirs > (append-map (match-lambda > diff --git a/guix/build/utils.scm b/guix/build/utils.scm > index c58a1afd1..c310b792c 100644 > --- a/guix/build/utils.scm > +++ b/guix/build/utils.scm [...] > +(define (is-wrapped? prog) > + "Return #t if PROG is already wrapped using wrap-program, else return = #f." > + (with-directory-excursion (dirname prog) > + (and-let* ((match-record (string-match "^\\.(.*)-real$" (basename pr= og)))) > + (access? (match:substring match-record 1) X_OK)))) By convention I=E2=80=99d suggest calling it =E2=80=98wrapped?=E2=80=99 rat= her than =E2=80=98is-wrapped?=E2=80=99. In fact, a more accurate name would be =E2= =80=98wrapper?=E2=80=99. Also I=E2=80=99d suggest not using SRFI-2 because IMO it doesn=E2=80=99t br= ing much and it=E2=80=99s not used anywhere in Guix currently. Also, =E2=80=98file-exis= ts?=E2=80=99 rather than =E2=80=98access?=E2=80=99, and no need to change directories. So: (define (wrapper? prog) "Return #t if PROG is a wrapper as produced by 'wrap-program'." (and (file-exists? prog) (let ((base (basename prog))) (and (string-prefix? "." base) (string-suffix? "-real" base))))) > From 71a7f6e39bd5b68b596bda2a75b1d245179349d0 Mon Sep 17 00:00:00 2001 > From: Arun Isaac > Date: Sat, 28 Jul 2018 17:31:44 +0530 > Subject: [PATCH v3 3/3] gnu: gajim: Return #t from wrap-gsettings-schema-= dir > phase. > To: clement@lassieur.org > Cc: mhw@netris.org, > andreas@enge.fr, > 32102@debbugs.gnu.org > > * gnu/packages/messaging.scm (gajim)[arguments]: Return #t from > wrap-gsettings-schema-dir phase. LGTM! Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Sun Jul 29 20:30:47 2018 Received: (at 32102) by debbugs.gnu.org; 30 Jul 2018 00:30:47 +0000 Received: from localhost ([127.0.0.1]:34217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fjw5G-000657-N5 for submit@debbugs.gnu.org; Sun, 29 Jul 2018 20:30:46 -0400 Received: from vultr.systemreboot.net ([45.77.148.100]:47372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fjw5E-00064r-I8 for 32102@debbugs.gnu.org; Sun, 29 Jul 2018 20:30:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From:Sender :Reply-To: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=O0bnFdchLkSEqFR8imGwMMCjbz7cSgmAupZkL8c2r8Q=; b=hhZcf4QpQEkxuaC6tri3rdxCl6 I4bj7+gPv0iE9osdZ4cx0AnyrgurDrJsyPExGgqJNOH6mA/u9/zWCKOqWRuViCrWYIaUu0kgXQbNH jjuJZWs4qe7Dba9Ml1OHPKUdDWwdekD0XjURxvWIszQIshEqBkCx1gCFiQOMZ+a/HRbc=; Received: from [192.168.2.1] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fjw55-0004lS-1m; Mon, 30 Jul 2018 06:00:35 +0530 From: Arun Isaac To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#32102] [PATCH v2 2/2] gnu: gajim: Combine wrap-program phases. In-Reply-To: <87y3dudsz0.fsf@gnu.org> References: <20180711192652.20186-1-arunisaac@systemreboot.net> <20180711192652.20186-3-arunisaac@systemreboot.net> <87zhyv1qe8.fsf@lassieur.org> <87y3dudsz0.fsf@gnu.org> Date: Mon, 30 Jul 2018 06:00:28 +0530 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32102 Cc: 32102@debbugs.gnu.org, =?utf-8?Q?Cl=C3=A9ment?= Lassieur 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.0 (-) ludo@gnu.org (Ludovic Court=C3=A8s) writes: >> From 6ee5cf4423109ab64df58c85f4114e456dda098b Mon Sep 17 00:00:00 2001 >> From: Arun Isaac >> Date: Wed, 11 Jul 2018 13:03:33 +0530 >> Subject: [PATCH v3 1/3] build-system: python: Do not double wrap executa= bles. >> To: clement@lassieur.org >> Cc: mhw@netris.org, >> andreas@enge.fr, >> 32102@debbugs.gnu.org > > Hmm, weird! What's weird? Are you referring to the Cc field? The people in the Cc field were originally referred to by Clement. So, I put them there to keep them in the loop. >> (define* (wrap #:key inputs outputs #:allow-other-keys) >> (define (list-of-files dir) >> - (map (cut string-append dir "/" <>) >> - (or (scandir dir (lambda (f) >> - (let ((s (stat (string-append dir "/" f)))) >> - (eq? 'regular (stat:type s))))) >> - '()))) >> + (find-files dir (lambda (file stat) >> + (and (eq? 'regular (stat:type stat)) >> + (not (is-wrapped? file)))))) > > Something I don=E2=80=99t get is that =E2=80=98wrap-program=E2=80=99 itse= lf is supposed to > detect already-wrapped program. I vaguely remember discussing it before > but I forgot what the conclusions were; do we really need extra > =E2=80=98wrapped?=E2=80=99 checks? Can=E2=80=99t we fix =E2=80=98wrap-pr= ogram=E2=80=99 itself? Could you refer to our earlier discussion on 32102? https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D32102 In the case of Gajim, our current wrapping ends up double wrapping and creating bin/.gajim-real-real. The original fix I proposed was to modify `wrap-program` to fix already-wrapped detection. But, after discussion with Clement, we decided to go with a is-wrapped? check in the python build system. Do check out our earlier discussion and let us know what you think. >> +(define (is-wrapped? prog) >> + "Return #t if PROG is already wrapped using wrap-program, else return= #f." >> + (with-directory-excursion (dirname prog) >> + (and-let* ((match-record (string-match "^\\.(.*)-real$" (basename p= rog)))) >> + (access? (match:substring match-record 1) X_OK)))) > > By convention I=E2=80=99d suggest calling it =E2=80=98wrapped?=E2=80=99 r= ather than > =E2=80=98is-wrapped?=E2=80=99. In fact, a more accurate name would be = =E2=80=98wrapper?=E2=80=99. Sure, will do. > Also I=E2=80=99d suggest not using SRFI-2 because IMO it doesn=E2=80=99t = bring much and > it=E2=80=99s not used anywhere in Guix currently. Also, =E2=80=98file-ex= ists?=E2=80=99 rather > than =E2=80=98access?=E2=80=99, and no need to change directories. So: > > (define (wrapper? prog) > "Return #t if PROG is a wrapper as produced by 'wrap-program'." > (and (file-exists? prog) > (let ((base (basename prog))) > (and (string-prefix? "." base) > (string-suffix? "-real" base))))) Sure, will do. From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 27 07:37:30 2018 Received: (at 32102) by debbugs.gnu.org; 27 Aug 2018 11:37:30 +0000 Received: from localhost ([127.0.0.1]:33622 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fuFpm-00005T-Od for submit@debbugs.gnu.org; Mon, 27 Aug 2018 07:37:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54128) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fuFpl-00005D-Bn for 32102@debbugs.gnu.org; Mon, 27 Aug 2018 07:37:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fuFpc-0003rx-1k for 32102@debbugs.gnu.org; Mon, 27 Aug 2018 07:37:20 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:37627) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fuFpb-0003rp-Th; Mon, 27 Aug 2018 07:37:15 -0400 Received: from [193.50.110.186] (port=41568 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fuFpb-0007fQ-K0; Mon, 27 Aug 2018 07:37:15 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Arun Isaac Subject: Re: [bug#32102] [PATCH v2 2/2] gnu: gajim: Combine wrap-program phases. References: <20180711192652.20186-1-arunisaac@systemreboot.net> <20180711192652.20186-3-arunisaac@systemreboot.net> <87zhyv1qe8.fsf@lassieur.org> <87y3dudsz0.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 10 Fructidor an 226 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 27 Aug 2018 13:37:13 +0200 In-Reply-To: (Arun Isaac's message of "Mon, 30 Jul 2018 06:00:28 +0530") Message-ID: <87mut8avme.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 32102 Cc: 32102@debbugs.gnu.org, =?utf-8?Q?Cl=C3=A9ment?= Lassieur 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: -6.0 (------) Hi Arun, Sorry for the delay. Arun Isaac skribis: > ludo@gnu.org (Ludovic Court=C3=A8s) writes: > >>> From 6ee5cf4423109ab64df58c85f4114e456dda098b Mon Sep 17 00:00:00 2001 >>> From: Arun Isaac >>> Date: Wed, 11 Jul 2018 13:03:33 +0530 >>> Subject: [PATCH v3 1/3] build-system: python: Do not double wrap execut= ables. >>> To: clement@lassieur.org >>> Cc: mhw@netris.org, >>> andreas@enge.fr, >>> 32102@debbugs.gnu.org >> >> Hmm, weird! > > What's weird? Are you referring to the Cc field? The people in the Cc > field were originally referred to by Clement. So, I put them there to > keep them in the loop. Yes that makes perfect sense. Sorry for the obscure comment on my side; I was just surprised to see a Cc: header like this in the patch itself, but it=E2=80=99s nothing special after all. >>> (define* (wrap #:key inputs outputs #:allow-other-keys) >>> (define (list-of-files dir) >>> - (map (cut string-append dir "/" <>) >>> - (or (scandir dir (lambda (f) >>> - (let ((s (stat (string-append dir "/" f)))) >>> - (eq? 'regular (stat:type s))))) >>> - '()))) >>> + (find-files dir (lambda (file stat) >>> + (and (eq? 'regular (stat:type stat)) >>> + (not (is-wrapped? file)))))) >> >> Something I don=E2=80=99t get is that =E2=80=98wrap-program=E2=80=99 its= elf is supposed to >> detect already-wrapped program. I vaguely remember discussing it before >> but I forgot what the conclusions were; do we really need extra >> =E2=80=98wrapped?=E2=80=99 checks? Can=E2=80=99t we fix =E2=80=98wrap-p= rogram=E2=80=99 itself? > > Could you refer to our earlier discussion on 32102? > > https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D32102 > > In the case of Gajim, our current wrapping ends up double wrapping and > creating bin/.gajim-real-real. The original fix I proposed was to modify > `wrap-program` to fix already-wrapped detection. But, after discussion > with Clement, we decided to go with a is-wrapped? check in the python > build system. Do check out our earlier discussion and let us know what > you think. Right. I re-read it and it=E2=80=99s all clear again. :-) The issue is t= hat =E2=80=98list-of-files=E2=80=99 in the =E2=80=98wrap=E2=80=99 phase of pyth= on-build-system would pick up files that are themselves wrappers already. Because of my slow reaction we missed the train of this =E2=80=98core-updat= es=E2=80=99 cycle. :-/ So I think it=E2=80=99ll have to be for next time. Sounds goo= d? Let=E2=80=99s not forget about it=E2=80=A6 Thank you, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Aug 28 04:37:24 2018 Received: (at 32102) by debbugs.gnu.org; 28 Aug 2018 08:37:24 +0000 Received: from localhost ([127.0.0.1]:34819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fuZV6-0007PQ-Ca for submit@debbugs.gnu.org; Tue, 28 Aug 2018 04:37:24 -0400 Received: from vultr.systemreboot.net ([45.77.148.100]:52738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fuZV5-0007PD-0D for 32102@debbugs.gnu.org; Tue, 28 Aug 2018 04:37:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From:Sender :Reply-To: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=Rm1QopErv0AKFwMojpivQl1qnT8emSlzGT1kO6+joek=; b=G+il/YxTgWaUUVV2YyMZd70tcM 0iapSBYSuUhhx1vOHcxWbkm0rpfyjw9miqovrm3q4NDonb30MtChtocEj6LBT3du2zAquej8hx/qK QQVfSe/AOUr//VOs8LE6f9NG5bBgEV5KAWlbrtSoa3wbiPIHi1lDloCaUTiKF7YPFqR0=; Received: from [14.139.128.15] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fuZUv-0000SP-91; Tue, 28 Aug 2018 14:07:14 +0530 From: Arun Isaac To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#32102] [PATCH v2 2/2] gnu: gajim: Combine wrap-program phases. In-Reply-To: <87mut8avme.fsf@gnu.org> References: <20180711192652.20186-1-arunisaac@systemreboot.net> <20180711192652.20186-3-arunisaac@systemreboot.net> <87zhyv1qe8.fsf@lassieur.org> <87y3dudsz0.fsf@gnu.org> <87mut8avme.fsf@gnu.org> Date: Tue, 28 Aug 2018 14:07:04 +0530 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 32102 Cc: 32102@debbugs.gnu.org, =?utf-8?Q?Cl=C3=A9ment?= Lassieur 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.0 (-) > Right. I re-read it and it=E2=80=99s all clear again. :-) The issue is= that > =E2=80=98list-of-files=E2=80=99 in the =E2=80=98wrap=E2=80=99 phase of py= thon-build-system would pick up > files that are themselves wrappers already. > > Because of my slow reaction we missed the train of this =E2=80=98core-upd= ates=E2=80=99 > cycle. :-/ So I think it=E2=80=99ll have to be for next time. Sounds g= ood? > > Let=E2=80=99s not forget about it=E2=80=A6 Sure, no problem! Sounds good. Apart from closely following the guix-devel list, is there anyway I can know when the next core-updates cycle comes up? From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 29 16:42:39 2018 Received: (at 32102) by debbugs.gnu.org; 29 Aug 2018 20:42:39 +0000 Received: from localhost ([127.0.0.1]:37481 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fv7IU-0002aw-N1 for submit@debbugs.gnu.org; Wed, 29 Aug 2018 16:42:38 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35569) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fv7IT-0002ak-7V for 32102@debbugs.gnu.org; Wed, 29 Aug 2018 16:42:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fv7IN-0002vd-2T for 32102@debbugs.gnu.org; Wed, 29 Aug 2018 16:42:32 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:58032) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv7IM-0002vT-UC; Wed, 29 Aug 2018 16:42:30 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=43908 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fv7IM-0006OW-Ka; Wed, 29 Aug 2018 16:42:30 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Arun Isaac Subject: Re: [bug#32102] [PATCH v2 2/2] gnu: gajim: Combine wrap-program phases. References: <20180711192652.20186-1-arunisaac@systemreboot.net> <20180711192652.20186-3-arunisaac@systemreboot.net> <87zhyv1qe8.fsf@lassieur.org> <87y3dudsz0.fsf@gnu.org> <87mut8avme.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 12 Fructidor an 226 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Wed, 29 Aug 2018 22:42:29 +0200 In-Reply-To: (Arun Isaac's message of "Tue, 28 Aug 2018 14:07:04 +0530") Message-ID: <87wos89a6i.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 32102 Cc: 32102@debbugs.gnu.org, =?utf-8?Q?Cl=C3=A9ment?= Lassieur 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: -6.0 (------) Arun Isaac skribis: >> Right. I re-read it and it=E2=80=99s all clear again. :-) The issue i= s that >> =E2=80=98list-of-files=E2=80=99 in the =E2=80=98wrap=E2=80=99 phase of p= ython-build-system would pick up >> files that are themselves wrappers already. >> >> Because of my slow reaction we missed the train of this =E2=80=98core-up= dates=E2=80=99 >> cycle. :-/ So I think it=E2=80=99ll have to be for next time. Sounds = good? >> >> Let=E2=80=99s not forget about it=E2=80=A6 > > Sure, no problem! Sounds good. Apart from closely following the > guix-devel list, is there anyway I can know when the next core-updates > cycle comes up? Not really, it=E2=80=99s rather informal, so you have to pay attention to heads-up messages on guix-devel and to branch creations/deletions on guix-commits. Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu Nov 22 11:54:22 2018 Received: (at 32102) by debbugs.gnu.org; 22 Nov 2018 16:54:22 +0000 Received: from localhost ([127.0.0.1]:42579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gPsFC-0002ct-4V for submit@debbugs.gnu.org; Thu, 22 Nov 2018 11:54:22 -0500 Received: from vultr.systemreboot.net ([45.77.148.100]:53808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gPsFA-0002cj-7k for 32102@debbugs.gnu.org; Thu, 22 Nov 2018 11:54:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; 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=16QpnEAu28hJEEwIypD7ssQIX9lx+TggOokehBbENiY=; b=PDfMS6dSD+nuQusPpXIPG7X05 EAQxCYDX6cmZr4Mhnjo3HxvXYjZQjPHhDeN5uBv7bSC46lMXiMVtqcPdztPMAtRc/tb5uBb6zXSGz cbv4H45rOsU4yOWD+ONG+8+cOqRmtJxGBAdKI//6TFQbA8nxrFGsEqNp6b4EqTgVJW72k=; Received: from [103.5.134.173] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gPsF3-0007Ap-CX; Thu, 22 Nov 2018 22:24:14 +0530 From: Arun Isaac To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#32102] [PATCH v2 2/2] gnu: gajim: Combine wrap-program phases. In-Reply-To: <87wos89a6i.fsf@gnu.org> References: <20180711192652.20186-1-arunisaac@systemreboot.net> <20180711192652.20186-3-arunisaac@systemreboot.net> <87zhyv1qe8.fsf@lassieur.org> <87y3dudsz0.fsf@gnu.org> <87mut8avme.fsf@gnu.org> <87wos89a6i.fsf@gnu.org> Date: Thu, 22 Nov 2018 22:24:06 +0530 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: May I push this patchset to the core-updates branch? If I understand correctly, a new core-updates cycle has come up. https://lists.gnu.org/archive/html/guix-devel/2018-11/msg00294.html Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.5 RCVD_IN_SORBS_WEB RBL: SORBS: sender is an abusable web server [103.5.134.173 listed in dnsbl.sorbs.net] -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 32102 Cc: 32102@debbugs.gnu.org, =?utf-8?Q?Cl=C3=A9ment?= Lassieur 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.5 (/) May I push this patchset to the core-updates branch? If I understand correctly, a new core-updates cycle has come up. https://lists.gnu.org/archive/html/guix-devel/2018-11/msg00294.html From debbugs-submit-bounces@debbugs.gnu.org Fri Nov 23 04:09:33 2018 Received: (at 32102) by debbugs.gnu.org; 23 Nov 2018 09:09:33 +0000 Received: from localhost ([127.0.0.1]:42991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gQ7Sv-00049l-CE for submit@debbugs.gnu.org; Fri, 23 Nov 2018 04:09:33 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45093) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gQ7Su-00049W-6c for 32102@debbugs.gnu.org; Fri, 23 Nov 2018 04:09:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gQ7Sn-0001ui-3F for 32102@debbugs.gnu.org; Fri, 23 Nov 2018 04:09:26 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_05 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:41088) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gQ7Sm-0001tg-EK; Fri, 23 Nov 2018 04:09:25 -0500 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=49444 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1gQ7Sm-00063I-4r; Fri, 23 Nov 2018 04:09:24 -0500 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Arun Isaac Subject: Re: [bug#32102] [PATCH v2 2/2] gnu: gajim: Combine wrap-program phases. References: <20180711192652.20186-1-arunisaac@systemreboot.net> <20180711192652.20186-3-arunisaac@systemreboot.net> <87zhyv1qe8.fsf@lassieur.org> <87y3dudsz0.fsf@gnu.org> <87mut8avme.fsf@gnu.org> <87wos89a6i.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 3 Frimaire an 227 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Fri, 23 Nov 2018 10:09:21 +0100 In-Reply-To: (Arun Isaac's message of "Thu, 22 Nov 2018 22:24:06 +0530") Message-ID: <87zhu088ji.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 32102 Cc: 32102@debbugs.gnu.org, =?utf-8?Q?Cl=C3=A9ment?= Lassieur 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: -6.0 (------) Hello Arun, Arun Isaac skribis: > May I push this patchset to the core-updates branch? If I understand > correctly, a new core-updates cycle has come up. > > https://lists.gnu.org/archive/html/guix-devel/2018-11/msg00294.html Unfortunately =E2=80=98core-updates=E2=80=99 still hasn=E2=80=99t been merg= ed (hence my call for help on guix-devel :-)). But the good news is that you can apply this patch to =E2=80=98core-updates-next=E2=80=99. Thanks for not forgetting about it! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 27 05:44:12 2018 Received: (at 32102-done) by debbugs.gnu.org; 27 Nov 2018 10:44:12 +0000 Received: from localhost ([127.0.0.1]:50482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gRaqi-0004oO-3H for submit@debbugs.gnu.org; Tue, 27 Nov 2018 05:44:12 -0500 Received: from vultr.systemreboot.net ([45.77.148.100]:60766) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gRaqg-0004oF-8u for 32102-done@debbugs.gnu.org; Tue, 27 Nov 2018 05:44:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; 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=au1WaXnFDqtRaJEX8P5oLR6s7xzN/oPmoXozvRZ1FJ8=; b=LVNZsbsPZ08JXhPs0F2yqXcJv 41noO88TXz5EATezHp4c6H5NXlR1AobRNF5eFPW8ADXuBniDbCvGOsZluvvtAAjZYZtOKnpvsPt8w zdRtRzqYPDdc7R4cqSPu8uYLg7FATdVs7L8Al1Iss49h4llxaXDP35VLdFDkhemfOUaro=; Received: from [14.139.128.15] (helo=steel) by systemreboot.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gRaqY-00017e-VY; Tue, 27 Nov 2018 16:14:04 +0530 From: Arun Isaac To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#32102] [PATCH v2 2/2] gnu: gajim: Combine wrap-program phases. In-Reply-To: <87zhu088ji.fsf@gnu.org> References: <20180711192652.20186-1-arunisaac@systemreboot.net> <20180711192652.20186-3-arunisaac@systemreboot.net> <87zhyv1qe8.fsf@lassieur.org> <87y3dudsz0.fsf@gnu.org> <87mut8avme.fsf@gnu.org> <87wos89a6i.fsf@gnu.org> <87zhu088ji.fsf@gnu.org> Date: Tue, 27 Nov 2018 16:13:51 +0530 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32102-done Cc: =?utf-8?Q?Cl=C3=A9ment?= Lassieur , 32102-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: -1.0 (-) I pushed "PATCH 1: Do not double wrap executables" to core-updates-next after making the changes you suggested. I pushed "PATCH 2: Rename wrap-program phases" to master since it only causes a rebuild of gajim. "PATCH 3: Return #t from wrap-gsettings-schema-dir phase" is now irrelevant due to commit 60c5b4448961ce1745b7f0bfada1e7620f238ea0 by Clement on master. From debbugs-submit-bounces@debbugs.gnu.org Tue Nov 27 07:24:15 2018 Received: (at 32102-done) by debbugs.gnu.org; 27 Nov 2018 12:24:15 +0000 Received: from localhost ([127.0.0.1]:50525 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gRcPW-0007Mv-VI for submit@debbugs.gnu.org; Tue, 27 Nov 2018 07:24:15 -0500 Received: from mail.lassieur.org ([83.152.10.219]:40968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gRcPV-0007Mn-R9 for 32102-done@debbugs.gnu.org; Tue, 27 Nov 2018 07:24:14 -0500 Received: from newt (smtp.parrot.biz [62.23.167.188]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 8091b24d (TLSv1.2:ECDHE-RSA-CHACHA20-POLY1305:256:NO); Tue, 27 Nov 2018 12:24:12 +0000 (UTC) References: <20180711192652.20186-1-arunisaac@systemreboot.net> <20180711192652.20186-3-arunisaac@systemreboot.net> <87zhyv1qe8.fsf@lassieur.org> <87y3dudsz0.fsf@gnu.org> <87mut8avme.fsf@gnu.org> <87wos89a6i.fsf@gnu.org> <87zhu088ji.fsf@gnu.org> User-agent: mu4e 1.0; emacs 26.1 From: =?utf-8?Q?Cl=C3=A9ment?= Lassieur To: Arun Isaac Subject: Re: [bug#32102] [PATCH v2 2/2] gnu: gajim: Combine wrap-program phases. In-reply-to: Date: Tue, 27 Nov 2018 13:24:11 +0100 Message-ID: <87zhtuyahg.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 32102-done Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 32102-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: -1.0 (-) Arun Isaac writes: > I pushed "PATCH 1: Do not double wrap executables" to core-updates-next > after making the changes you suggested. > > I pushed "PATCH 2: Rename wrap-program phases" to master since it > only causes a rebuild of gajim. > > "PATCH 3: Return #t from wrap-gsettings-schema-dir phase" is now > irrelevant due to commit 60c5b4448961ce1745b7f0bfada1e7620f238ea0 by > Clement on master. Great, thank you Arun!! From unknown Sat Sep 06 10:20:49 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, 26 Dec 2018 12:24:03 +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