1 |
On 8/4/20 7:35 PM, Aaron Bauman wrote: |
2 |
> * This fixes the one instance of trailing-comma-tuple in the repo |
3 |
> * A tuple does need created, but lets do so inside of parentheses as |
4 |
> expected |
5 |
> |
6 |
> Suggested-By: Sam James <sam@g.o> |
7 |
> Suggested-By: Zac Medico <zmedico@g.o> |
8 |
> Signed-off-by: Aaron Bauman <bman@g.o> |
9 |
> --- |
10 |
> lib/portage/repository/config.py | 2 +- |
11 |
> pylintrc | 3 ++- |
12 |
> 2 files changed, 3 insertions(+), 2 deletions(-) |
13 |
> |
14 |
> diff --git a/lib/portage/repository/config.py b/lib/portage/repository/config.py |
15 |
> index 0f3e582f8..f7c956dd8 100644 |
16 |
> --- a/lib/portage/repository/config.py |
17 |
> +++ b/lib/portage/repository/config.py |
18 |
> @@ -871,7 +871,7 @@ class RepoConfigLoader: |
19 |
> continue |
20 |
> if repo.masters is None: |
21 |
> if self.mainRepo() and repo_name != self.mainRepo().name: |
22 |
> - repo.masters = self.mainRepo(), |
23 |
> + repo.masters = (self.mainRepo(),) |
24 |
> else: |
25 |
> repo.masters = () |
26 |
> else: |
27 |
> diff --git a/pylintrc b/pylintrc |
28 |
> index 337311daa..5e13f714c 100644 |
29 |
> --- a/pylintrc |
30 |
> +++ b/pylintrc |
31 |
> @@ -21,7 +21,8 @@ enable= |
32 |
> redefined-builtin, |
33 |
> reimported, |
34 |
> relative-beyond-top-level, |
35 |
> - trailing-newlines, |
36 |
> + trailing-comma-tuple, |
37 |
> + trailing-newlines, |
38 |
> trailing-whitespace, |
39 |
> unexpected-line-ending-format, |
40 |
> unnecessary-semicolon, |
41 |
> |
42 |
|
43 |
Thanks, merged: |
44 |
|
45 |
https://gitweb.gentoo.org/proj/portage.git/commit/?id=3e0063094ce656a173f46a9a4837260322769f2e |
46 |
-- |
47 |
Thanks, |
48 |
Zac |