Gentoo Archives: gentoo-portage-dev

From: Aaron Bauman <bman@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Aaron Bauman <bman@g.o>
Subject: [gentoo-portage-dev] [PATCH 45/68] lib/portage/tests/resolver/test_slot_collisions.py: fix whitespace
Date: Mon, 03 Aug 2020 22:46:03
Message-Id: 20200803224327.1593726-45-bman@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH 01/68] lib/portage/util/_dyn_libs/PreservedLibsRegistry.py: fix whitespace by Aaron Bauman
1 Signed-off-by: Aaron Bauman <bman@g.o>
2 ---
3 lib/portage/tests/resolver/test_slot_collisions.py | 8 ++++----
4 1 file changed, 4 insertions(+), 4 deletions(-)
5
6 diff --git a/lib/portage/tests/resolver/test_slot_collisions.py b/lib/portage/tests/resolver/test_slot_collisions.py
7 index a15ebf4e0..d84ccfcef 100644
8 --- a/lib/portage/tests/resolver/test_slot_collisions.py
9 +++ b/lib/portage/tests/resolver/test_slot_collisions.py
10 @@ -1,4 +1,4 @@
11 -# Copyright 2010-2019 Gentoo Authors
12 +# Copyright 2010-2020 Gentoo Authors
13 # Distributed under the terms of the GNU General Public License v2
14
15 from portage.tests import TestCase
16 @@ -9,7 +9,7 @@ class SlotCollisionTestCase(TestCase):
17 def testSlotCollision(self):
18
19 ebuilds = {
20 - "dev-libs/A-1": { "PDEPEND": "foo? ( dev-libs/B )", "IUSE": "foo" },
21 + "dev-libs/A-1": { "PDEPEND": "foo? ( dev-libs/B )", "IUSE": "foo" },
22 "dev-libs/B-1": { "IUSE": "foo" },
23 "dev-libs/C-1": { "DEPEND": "dev-libs/A[foo]", "EAPI": 2 },
24 "dev-libs/D-1": { "DEPEND": "dev-libs/A[foo=] dev-libs/B[foo=]", "IUSE": "foo", "EAPI": 2 },
25 @@ -50,11 +50,11 @@ class SlotCollisionTestCase(TestCase):
26 "dev-lang/perl-5.16": {"SLOT": "0/5.16", "EAPI": "5"},
27 }
28 installed = {
29 - "dev-libs/A-1": { "PDEPEND": "foo? ( dev-libs/B )", "IUSE": "foo", "USE": "foo" },
30 + "dev-libs/A-1": { "PDEPEND": "foo? ( dev-libs/B )", "IUSE": "foo", "USE": "foo" },
31 "dev-libs/B-1": { "IUSE": "foo", "USE": "foo" },
32 "dev-libs/C-1": { "DEPEND": "dev-libs/A[foo]", "EAPI": 2 },
33 "dev-libs/D-1": { "DEPEND": "dev-libs/A[foo=] dev-libs/B[foo=]", "IUSE": "foo", "USE": "foo", "EAPI": 2 },
34 -
35 +
36 "sci-libs/K-1": { "IUSE": "foo", "USE": "" },
37 "sci-libs/L-1": { "DEPEND": "sci-libs/K[-foo]" },
38
39 --
40 2.28.0