From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekn5J-00048S-J3 for guix-patches@gnu.org; Sun, 11 Feb 2018 03:34:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ekn5G-000396-Ba for guix-patches@gnu.org; Sun, 11 Feb 2018 03:34:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:57907) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ekn5G-00038G-7V for guix-patches@gnu.org; Sun, 11 Feb 2018 03:34:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ekn5F-00054r-UG for guix-patches@gnu.org; Sun, 11 Feb 2018 03:34:01 -0500 Subject: [bug#30420] [PATCH 0/1] union: Wrap collisions with newlines. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekn4i-0003vZ-TX for guix-patches@gnu.org; Sun, 11 Feb 2018 03:33:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ekn4f-0002di-MC for guix-patches@gnu.org; Sun, 11 Feb 2018 03:33:28 -0500 Received: from mail-lf0-x234.google.com ([2a00:1450:4010:c07::234]:44300) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ekn4f-0002cb-EB for guix-patches@gnu.org; Sun, 11 Feb 2018 03:33:25 -0500 Received: by mail-lf0-x234.google.com with SMTP id c188so714083lfc.11 for ; Sun, 11 Feb 2018 00:33:25 -0800 (PST) Received: from magnolia ([94.142.26.13]) by smtp.gmail.com with ESMTPSA id s185sm1183367lfs.71.2018.02.11.00.33.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Feb 2018 00:33:22 -0800 (PST) From: Oleg Pykhalov Date: Sun, 11 Feb 2018 11:33:17 +0300 Message-ID: <87o9kw2aeq.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0000-cover-letter.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH 0/1] union: Wrap collisions with newlines. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30420@debbugs.gnu.org >From 81ec3bdebe338ff72e3e963698e96ba4d760d582 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sun, 11 Feb 2018 11:20:39 +0300 Subject: [PATCH 0/1] union: Wrap collisions with newlines. Hello Guix, This patch makes =E2=80=9Ccollision encountered=E2=80=9D warnings aligned u= sing newlines instead of spaces between collisioned items: --8<---------------cut here---------------start------------->8--- warning: collision encountered: /gnu/store/0wq9xddbgv3y959dhk0njasbi8zr4d8a-gtk+-3.22.21/share/icons/hicolo= r/icon-theme.cache /gnu/store/0712rfcnbymvc5m8n1618gil2j9cb081-inkscape-0.92.2/share/icons/hic= olor/icon-theme.cache warning: arbitrarily choosing /gnu/store/0wq9xddbgv3y959dhk0njasbi8zr4d8a-g= tk+-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 =E2=80=A6 warning: collision encountered: /gnu/store/0wq9xddbgv3y959dhk0njasbi8zr4d8a-gtk+-3.22.21/share/icons/hicolo= r/icon-theme.cache /gnu/store/0712rfcnbymvc5m8n1618gil2j9cb081-inkscape-0.92.2/share/icons/hic= olor/icon-theme.cache warning: arbitrarily choosing /gnu/store/0wq9xddbgv3y959dhk0njasbi8zr4d8a-g= tk+-3.22.21/share/icons/hicolor/icon-theme.cache warning: collision encountered: /gnu/store/hhag6wxjcmh4cvv20r2g9myjlnw2lrxx-gtk-icon-themes/share/icons/hic= olor/icon-theme.cache /gnu/store/0wq9xddbgv3y959dhk0njasbi8zr4d8a-gtk+-3.22.21/share/icons/hicolo= r/icon-theme.cache /gnu/store/0712rfcnbymvc5m8n1618gil2j9cb081-inkscape-0.92.2/share/icons/hic= olor/icon-theme.cache warning: arbitrarily choosing /gnu/store/hhag6wxjcmh4cvv20r2g9myjlnw2lrxx-g= tk-icon-themes/share/icons/hicolor/icon-theme.cache =E2=80=A6 --8<---------------cut here---------------end--------------->8--- Without patch: --8<---------------cut here---------------start------------->8--- $ guix package -i hello =E2=80=A6 warning: collision encountered: /gnu/store/0wq9xddbgv3y959dhk0njasbi8zr4d8a= -gtk+-3.22.21/share/icons/hicolor/icon-theme.cache /gnu/store/0712rfcnbymvc= 5m8n1618gil2j9cb081-inkscape-0.92.2/share/icons/hicolor/icon-theme.cache=20 warning: arbitrarily choosing /gnu/store/0wq9xddbgv3y959dhk0njasbi8zr4d8a-g= tk+-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/0wq9xddbgv= 3y959dhk0njasbi8zr4d8a-gtk+-3.22.21/share/icons/hicolor/icon-theme.cache /g= nu/store/0712rfcnbymvc5m8n1618gil2j9cb081-inkscape-0.92.2/share/icons/hicol= or/icon-theme.cache=20 warning: arbitrarily choosing /gnu/store/nsjg1i5f6amwwqh14k55gj8p72yknxgw-g= tk-icon-themes/share/icons/hicolor/icon-theme.cache =E2=80=A6 --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(-) --=20 2.15.1