| 1 |
commit: a791a8a076690ef357939583de6478fe7dd1d3f6 |
| 2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 3 22:43:04 2020 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 3 23:28:00 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a791a8a0 |
| 7 |
|
| 8 |
lib/portage/tests/resolver/test_slot_collisions.py: fix whitespace |
| 9 |
|
| 10 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
| 11 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 12 |
|
| 13 |
lib/portage/tests/resolver/test_slot_collisions.py | 8 ++++---- |
| 14 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/lib/portage/tests/resolver/test_slot_collisions.py b/lib/portage/tests/resolver/test_slot_collisions.py |
| 17 |
index a15ebf4e0..d84ccfcef 100644 |
| 18 |
--- a/lib/portage/tests/resolver/test_slot_collisions.py |
| 19 |
+++ b/lib/portage/tests/resolver/test_slot_collisions.py |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 2010-2019 Gentoo Authors |
| 22 |
+# Copyright 2010-2020 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
from portage.tests import TestCase |
| 26 |
@@ -9,7 +9,7 @@ class SlotCollisionTestCase(TestCase): |
| 27 |
def testSlotCollision(self): |
| 28 |
|
| 29 |
ebuilds = { |
| 30 |
- "dev-libs/A-1": { "PDEPEND": "foo? ( dev-libs/B )", "IUSE": "foo" }, |
| 31 |
+ "dev-libs/A-1": { "PDEPEND": "foo? ( dev-libs/B )", "IUSE": "foo" }, |
| 32 |
"dev-libs/B-1": { "IUSE": "foo" }, |
| 33 |
"dev-libs/C-1": { "DEPEND": "dev-libs/A[foo]", "EAPI": 2 }, |
| 34 |
"dev-libs/D-1": { "DEPEND": "dev-libs/A[foo=] dev-libs/B[foo=]", "IUSE": "foo", "EAPI": 2 }, |
| 35 |
@@ -50,11 +50,11 @@ class SlotCollisionTestCase(TestCase): |
| 36 |
"dev-lang/perl-5.16": {"SLOT": "0/5.16", "EAPI": "5"}, |
| 37 |
} |
| 38 |
installed = { |
| 39 |
- "dev-libs/A-1": { "PDEPEND": "foo? ( dev-libs/B )", "IUSE": "foo", "USE": "foo" }, |
| 40 |
+ "dev-libs/A-1": { "PDEPEND": "foo? ( dev-libs/B )", "IUSE": "foo", "USE": "foo" }, |
| 41 |
"dev-libs/B-1": { "IUSE": "foo", "USE": "foo" }, |
| 42 |
"dev-libs/C-1": { "DEPEND": "dev-libs/A[foo]", "EAPI": 2 }, |
| 43 |
"dev-libs/D-1": { "DEPEND": "dev-libs/A[foo=] dev-libs/B[foo=]", "IUSE": "foo", "USE": "foo", "EAPI": 2 }, |
| 44 |
- |
| 45 |
+ |
| 46 |
"sci-libs/K-1": { "IUSE": "foo", "USE": "" }, |
| 47 |
"sci-libs/L-1": { "DEPEND": "sci-libs/K[-foo]" }, |
Archives