[gentoo-portage-dev] [PATCH] lib/portage/repository/config.py: fix trailing-comma-tuple

[gentoo-portage-dev] [PATCH] lib/portage/repository/config.py: fix trailing-comma-tuple

[Aaron Bauman]

* This fixes the one instance of trailing-comma-tuple in the repo
* A tuple does need created, but lets do so inside of parentheses as
  expected

Suggested-By: Sam James <sam@gentoo.org>
Suggested-By: Zac Medico <zmedico@gentoo.org>
Signed-off-by: Aaron Bauman <bman@gentoo.org>
---
 lib/portage/repository/config.py | 2 +-
 pylintrc                         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/portage/repository/config.py b/lib/portage/repository/config.py
index 0f3e582f8..f7c956dd8 100644
--- a/lib/portage/repository/config.py
+++ b/lib/portage/repository/config.py
@@ -871,7 +871,7 @@ class RepoConfigLoader:
 				continue
 			if repo.masters is None:
 				if self.mainRepo() and repo_name != self.mainRepo().name:
-					repo.masters = self.mainRepo(),
+					repo.masters = (self.mainRepo(),)
 				else:
 					repo.masters = ()
 			else:
diff --git a/pylintrc b/pylintrc
index 337311daa..5e13f714c 100644
--- a/pylintrc
+++ b/pylintrc
@@ -21,7 +21,8 @@ enable=
         redefined-builtin,
         reimported,
         relative-beyond-top-level,
-        trailing-newlines,
+        trailing-comma-tuple,
+	trailing-newlines,
         trailing-whitespace,
         unexpected-line-ending-format,
         unnecessary-semicolon,
-- 
2.28.0

[gentoo-portage-dev] Re: [PATCH] lib/portage/repository/config.py: fix trailing-comma-tuple

[Zac Medico]

[-- Attachment #1.1: Type: text/plain, Size: 1573 bytes --]

On 8/4/20 7:35 PM, Aaron Bauman wrote:
> * This fixes the one instance of trailing-comma-tuple in the repo
> * A tuple does need created, but lets do so inside of parentheses as
>   expected
> 
> Suggested-By: Sam James <sam@gentoo.org>
> Suggested-By: Zac Medico <zmedico@gentoo.org>
> Signed-off-by: Aaron Bauman <bman@gentoo.org>
> ---
>  lib/portage/repository/config.py | 2 +-
>  pylintrc                         | 3 ++-
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/portage/repository/config.py b/lib/portage/repository/config.py
> index 0f3e582f8..f7c956dd8 100644
> --- a/lib/portage/repository/config.py
> +++ b/lib/portage/repository/config.py
> @@ -871,7 +871,7 @@ class RepoConfigLoader:
>  				continue
>  			if repo.masters is None:
>  				if self.mainRepo() and repo_name != self.mainRepo().name:
> -					repo.masters = self.mainRepo(),
> +					repo.masters = (self.mainRepo(),)
>  				else:
>  					repo.masters = ()
>  			else:
> diff --git a/pylintrc b/pylintrc
> index 337311daa..5e13f714c 100644
> --- a/pylintrc
> +++ b/pylintrc
> @@ -21,7 +21,8 @@ enable=
>          redefined-builtin,
>          reimported,
>          relative-beyond-top-level,
> -        trailing-newlines,
> +        trailing-comma-tuple,
> +	trailing-newlines,
>          trailing-whitespace,
>          unexpected-line-ending-format,
>          unnecessary-semicolon,
> 

Thanks, merged:

https://gitweb.gentoo.org/proj/portage.git/commit/?id=3e0063094ce656a173f46a9a4837260322769f2e
-- 
Thanks,
Zac


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 981 bytes --]