GNU bug report logs - #30420
[PATCH 0/1] union: Wrap collisions with newlines.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 30420 in the body.
You can then email your comments to 30420 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/1] union: Wrap collisions with newlines.
Date: Sun, 11 Feb 2018 11:33:17 +0300

[0000-cover-letter.patch (text/x-patch, inline)]

From 81ec3bdebe338ff72e3e963698e96ba4d760d582 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust <at> gmail.com>
Date: Sun, 11 Feb 2018 11:20:39 +0300
Subject: [PATCH 0/1] union: Wrap collisions with newlines.

Hello Guix,

This patch makes “collision encountered” warnings aligned using newlines
instead of spaces between collisioned items:
--8<---------------cut here---------------start------------->8---
warning: collision encountered:
/gnu/store/0wq9xddbgv3y959dhk0njasbi8zr4d8a-gtk+-3.22.21/share/icons/hicolor/icon-theme.cache
/gnu/store/0712rfcnbymvc5m8n1618gil2j9cb081-inkscape-0.92.2/share/icons/hicolor/icon-theme.cache
warning: arbitrarily choosing /gnu/store/0wq9xddbgv3y959dhk0njasbi8zr4d8a-gtk+-3.22.21/share/icons/hicolor/icon-theme.cache
36511 entries processed in 17.6 s
--8<---------------cut here---------------end--------------->8---

Also another newline separates warnings:
--8<---------------cut here---------------start------------->8---
$ /home/natsu/src/guix/pre-inst-env guix package -i hello
…

warning: collision encountered:
/gnu/store/0wq9xddbgv3y959dhk0njasbi8zr4d8a-gtk+-3.22.21/share/icons/hicolor/icon-theme.cache
/gnu/store/0712rfcnbymvc5m8n1618gil2j9cb081-inkscape-0.92.2/share/icons/hicolor/icon-theme.cache
warning: arbitrarily choosing /gnu/store/0wq9xddbgv3y959dhk0njasbi8zr4d8a-gtk+-3.22.21/share/icons/hicolor/icon-theme.cache

warning: collision encountered:
/gnu/store/hhag6wxjcmh4cvv20r2g9myjlnw2lrxx-gtk-icon-themes/share/icons/hicolor/icon-theme.cache
/gnu/store/0wq9xddbgv3y959dhk0njasbi8zr4d8a-gtk+-3.22.21/share/icons/hicolor/icon-theme.cache
/gnu/store/0712rfcnbymvc5m8n1618gil2j9cb081-inkscape-0.92.2/share/icons/hicolor/icon-theme.cache
warning: arbitrarily choosing /gnu/store/hhag6wxjcmh4cvv20r2g9myjlnw2lrxx-gtk-icon-themes/share/icons/hicolor/icon-theme.cache
…
--8<---------------cut here---------------end--------------->8---

Without patch:
--8<---------------cut here---------------start------------->8---
$ guix package -i hello
…
warning: collision encountered: /gnu/store/0wq9xddbgv3y959dhk0njasbi8zr4d8a-gtk+-3.22.21/share/icons/hicolor/icon-theme.cache /gnu/store/0712rfcnbymvc5m8n1618gil2j9cb081-inkscape-0.92.2/share/icons/hicolor/icon-theme.cache 
warning: arbitrarily choosing /gnu/store/0wq9xddbgv3y959dhk0njasbi8zr4d8a-gtk+-3.22.21/share/icons/hicolor/icon-theme.cache
warning: collision encountered: /gnu/store/nsjg1i5f6amwwqh14k55gj8p72yknxgw-gtk-icon-themes/share/icons/hicolor/icon-theme.cache /gnu/store/0wq9xddbgv3y959dhk0njasbi8zr4d8a-gtk+-3.22.21/share/icons/hicolor/icon-theme.cache /gnu/store/0712rfcnbymvc5m8n1618gil2j9cb081-inkscape-0.92.2/share/icons/hicolor/icon-theme.cache 
warning: arbitrarily choosing /gnu/store/nsjg1i5f6amwwqh14k55gj8p72yknxgw-gtk-icon-themes/share/icons/hicolor/icon-theme.cache
…
--8<---------------cut here---------------end--------------->8---

Oleg Pykhalov (1):
  union: Wrap collisions with newlines.

 guix/build/union.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.15.1

Message #8 received at 30420 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: 30420 <at> debbugs.gnu.org
Cc: Oleg Pykhalov <go.wigust <at> gmail.com>
Subject: [PATCH 1/1] union: Wrap collisions with newlines.
Date: Sun, 11 Feb 2018 11:34:26 +0300

* guix/build/union.scm (union-build): Wrap collisions with newlines.
---
 guix/build/union.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/build/union.scm b/guix/build/union.scm
index 256123c56..d46b75003 100644
--- a/guix/build/union.scm
+++ b/guix/build/union.scm
@@ -93,7 +93,7 @@ make sure the caller can modify them later."
     (cond ((null? dirs)
            ;; The inputs are all files.
            (format (current-error-port)
-                   "warning: collision encountered: ~{~a ~}~%"
+                   "~%warning: collision encountered:~%~{~a~%~}"
                    files)
 
            (let ((file (first files)))
-- 
2.15.1

Message #11 received at 30420 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Oleg Pykhalov <go.wigust <at> gmail.com>
Cc: 30420 <at> debbugs.gnu.org
Subject: Re: [bug#30420] [PATCH 1/1] union: Wrap collisions with newlines.
Date: Thu, 15 Feb 2018 15:25:05 +0100

Oleg Pykhalov <go.wigust <at> gmail.com> skribis:

> * guix/build/union.scm (union-build): Wrap collisions with newlines.

OK!

Ludo'.

Message #14 received at 30420 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: ludo <at> gnu.org (Ludovic Courtès)
Cc: 30420 <at> debbugs.gnu.org, 30420-done <at> debbugs.gnu.org
Subject: Re: [bug#30420] [PATCH 1/1] union: Wrap collisions with newlines.
Date: Thu, 15 Feb 2018 20:55:01 +0300

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

ludo <at> gnu.org (Ludovic Courtès) writes:

> Oleg Pykhalov <go.wigust <at> gmail.com> skribis:
>
>> * guix/build/union.scm (union-build): Wrap collisions with newlines.
>
> OK!

Pushed as 06a9dc2fd021258da282e14d165d53090d85ffe1

I'll close the bug report.

Oleg.

[signature.asc (application/pgp-signature, inline)]

Previous Next

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