GNU bug report logs - #51030
[core-updates-frozen] build: qt-utils: Don't wrap .X-real files.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#51030: closed ([core-updates-frozen] build: qt-utils: Don't
 wrap .X-real files.)
Date: Fri, 12 Nov 2021 05:50:01 +0000

[Message part 1 (text/plain, inline)]

Your message dated Fri, 12 Nov 2021 00:49:06 -0500
with message-id <8735o1rkj1.fsf <at> gmail.com>
and subject line Re: bug#51030: [core-updates-frozen] build: qt-utils: Don't wrap .X-real files.
has caused the debbugs.gnu.org bug report #51030,
regarding [core-updates-frozen] build: qt-utils: Don't wrap .X-real files.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
51030: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=51030
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Brendan Tildesley <mail <at> brendan.scot>
To: guix-patches <at> gnu.org
Subject: [core-updates-frozen] build: qt-utils: Don't wrap .X-real files.
Date: Tue,  5 Oct 2021 22:01:06 +1100

* guix/build/qt-utils.scm (find-files-to-wrap): Exclude already wrapped
programs. This is forbidden in wrap-program now due to a738a663a99.
---
 guix/build/qt-utils.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm
index c2b80cab7d..e86442b79f 100644
--- a/guix/build/qt-utils.scm
+++ b/guix/build/qt-utils.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2020 Jakub Kądziołka <kuba <at> kadziolka.net>
 ;;; Copyright © 2021 Ludovic Courtès <ludo <at> gnu.org>
 ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
+;;; Copyright © 2021 Brendan Tildesley <mail <at> brendan.scot>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -133,7 +134,10 @@ add a dependency of that output on Qt."
   (define (find-files-to-wrap output-dir)
     (append-map
      (lambda (dir)
-       (if (directory-exists? dir) (find-files dir ".*") (list)))
+       (if (directory-exists? dir)
+           (find-files dir (lambda (file stat)
+                             (not (wrapped-program? file))))
+           (list)))
      (list (string-append output-dir "/bin")
            (string-append output-dir "/sbin")
            (string-append output-dir "/libexec")
-- 
2.33.0

[Message part 3 (message/rfc822, inline)]

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Brendan Tildesley <mail <at> brendan.scot>
Cc: 51030-done <at> debbugs.gnu.org
Subject: Re: bug#51030: [core-updates-frozen] build: qt-utils: Don't wrap
 .X-real files.
Date: Fri, 12 Nov 2021 00:49:06 -0500

Hello,

Brendan Tildesley <mail <at> brendan.scot> writes:

> * guix/build/qt-utils.scm (find-files-to-wrap): Exclude already wrapped
> programs. This is forbidden in wrap-program now due to a738a663a99.
> ---
>  guix/build/qt-utils.scm | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm
> index c2b80cab7d..e86442b79f 100644
> --- a/guix/build/qt-utils.scm
> +++ b/guix/build/qt-utils.scm
> @@ -4,6 +4,7 @@
>  ;;; Copyright © 2020 Jakub Kądziołka <kuba <at> kadziolka.net>
>  ;;; Copyright © 2021 Ludovic Courtès <ludo <at> gnu.org>
>  ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
> +;;; Copyright © 2021 Brendan Tildesley <mail <at> brendan.scot>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -133,7 +134,10 @@ add a dependency of that output on Qt."
>    (define (find-files-to-wrap output-dir)
>      (append-map
>       (lambda (dir)
> -       (if (directory-exists? dir) (find-files dir ".*") (list)))
> +       (if (directory-exists? dir)
> +           (find-files dir (lambda (file stat)
> +                             (not (wrapped-program? file))))
> +           (list)))
>       (list (string-append output-dir "/bin")
>             (string-append output-dir "/sbin")
>             (string-append output-dir "/libexec")

That's been merged in core-updates-frozen with commit
3dfe45c3f10e31a016b22127eede8099ca4f4b8f.

Thank you!

Closing.

Maxim

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.