* [bug#30420] [PATCH 0/1] union: Wrap collisions with newlines.
@ 2018-02-11 8:33 Oleg Pykhalov
2018-02-11 8:34 ` [bug#30420] [PATCH 1/1] " Oleg Pykhalov
0 siblings, 1 reply; 4+ messages in thread
From: Oleg Pykhalov @ 2018-02-11 8:33 UTC (permalink / raw)
To: 30420
[-- Attachment #1: [PATCH 0/1] union: Wrap collisions with newlines. --]
[-- Type: text/x-patch, Size: 3074 bytes --]
From 81ec3bdebe338ff72e3e963698e96ba4d760d582 Mon Sep 17 00:00:00 2001
From: Oleg Pykhalov <go.wigust@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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#30420] [PATCH 1/1] union: Wrap collisions with newlines.
2018-02-11 8:33 [bug#30420] [PATCH 0/1] union: Wrap collisions with newlines Oleg Pykhalov
@ 2018-02-11 8:34 ` Oleg Pykhalov
2018-02-15 14:25 ` Ludovic Courtès
0 siblings, 1 reply; 4+ messages in thread
From: Oleg Pykhalov @ 2018-02-11 8:34 UTC (permalink / raw)
To: 30420
* 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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#30420] [PATCH 1/1] union: Wrap collisions with newlines.
2018-02-11 8:34 ` [bug#30420] [PATCH 1/1] " Oleg Pykhalov
@ 2018-02-15 14:25 ` Ludovic Courtès
2018-02-15 17:55 ` bug#30420: " Oleg Pykhalov
0 siblings, 1 reply; 4+ messages in thread
From: Ludovic Courtès @ 2018-02-15 14:25 UTC (permalink / raw)
To: Oleg Pykhalov; +Cc: 30420
Oleg Pykhalov <go.wigust@gmail.com> skribis:
> * guix/build/union.scm (union-build): Wrap collisions with newlines.
OK!
Ludo'.
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#30420: [PATCH 1/1] union: Wrap collisions with newlines.
2018-02-15 14:25 ` Ludovic Courtès
@ 2018-02-15 17:55 ` Oleg Pykhalov
0 siblings, 0 replies; 4+ messages in thread
From: Oleg Pykhalov @ 2018-02-15 17:55 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 30420, 30420-done
[-- Attachment #1: Type: text/plain, Size: 270 bytes --]
ludo@gnu.org (Ludovic Courtès) writes:
> Oleg Pykhalov <go.wigust@gmail.com> skribis:
>
>> * guix/build/union.scm (union-build): Wrap collisions with newlines.
>
> OK!
Pushed as 06a9dc2fd021258da282e14d165d53090d85ffe1
I'll close the bug report.
Oleg.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-02-15 18:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-11 8:33 [bug#30420] [PATCH 0/1] union: Wrap collisions with newlines Oleg Pykhalov
2018-02-11 8:34 ` [bug#30420] [PATCH 1/1] " Oleg Pykhalov
2018-02-15 14:25 ` Ludovic Courtès
2018-02-15 17:55 ` bug#30420: " Oleg Pykhalov
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.