[gentoo-portage-dev] [PATCH] lib/*: fix superfluous-parens and enable check
Signed-off-by: Aaron Bauman
---
lib/_emerge/actions.py | 14 +++---
lib/_emerge/resolver/slot_collision.py | 4 ++--
lib/_emerge/stdout_spinner.py| 2 +-
lib/_emerge/unmerge.py | 4 ++--
lib/portage/_sets/dbapi.py | 6 +++---
lib/portage/cache/template.py| 2 +-
lib/portage/dep/__init__.py | 10 +-
lib/portage/dep/dep_check.py | 2 +-
lib/portage/getbinpkg.py | 6 +++---
lib/portage/glsa.py | 2 +-
lib/portage/localization.py | 2 +-
lib/portage/locks.py | 2 +-
lib/portage/manifest.py | 2 +-
lib/portage/news.py | 4 ++--
lib/portage/package/ebuild/config.py | 2 +-
lib/portage/process.py | 6 +++---
lib/portage/sync/controller.py | 4 ++--
lib/portage/sync/modules/rsync/rsync.py | 8
lib/portage/tests/resolver/ResolverPlayground.py | 2 +-
lib/portage/util/__init__.py | 4 ++--
lib/portage/util/env_update.py | 2 +-
lib/portage/xpak.py | 10 +-
pylintrc | 1 +
23 files changed, 51 insertions(+), 50 deletions(-)
diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py
index 43e9de43a..7d2d9b315 100644
--- a/lib/_emerge/actions.py
+++ b/lib/_emerge/actions.py
@@ -333,7 +333,7 @@ def action_build(emerge_config, trees=DeprecationWarning,
return 1
else:
- if ("--resume" in myopts):
+ if "--resume" in myopts:
print(darkgreen("emerge: It seems we have nothing to
resume..."))
return os.EX_OK
@@ -450,7 +450,7 @@ def action_build(emerge_config, trees=DeprecationWarning,
myopts.pop("--ask", None)
if ("--pretend" in myopts) and not ("--fetchonly" in myopts or
"--fetch-all-uri" in myopts):
- if ("--resume" in myopts):
+ if "--resume" in myopts:
mymergelist = mydepgraph.altlist()
if len(mymergelist) == 0:
print(colorize("INFORM", "emerge: It seems we
have nothing to resume..."))
@@ -522,7 +522,7 @@ def action_build(emerge_config, trees=DeprecationWarning,
level=logging.ERROR,
noiselevel=-1)
return 1
- if ("--resume" in myopts):
+ if "--resume" in myopts:
favorites=mtimedb["resume"]["favorites"]
else:
@@ -2319,7 +2319,7 @@ def adjust_config(myopts, settings):
settings.backup_changes("PORTAGE_VERBOSE")
# Set so that configs will be merged regardless of remembered status
- if ("--noconfmem" in myopts):
+ if "--noconfmem" in myopts:
settings["NOCONFMEM"]="1"
settings.backup_changes("NOCONFMEM")
@@ -2424,7 +2424,7 @@ def getportageversion(portdir, _unused, profile, chost,
vardb):
if profilever is None:
try:
profilever = "!" + os.readlink(profile)
- except (OSError):
+ except OSError:
pass
if profilever is None:
@@ -3057,7 +3057,7 @@ def run_action(emerge_config):
level=logging.ERROR, noiselevel=-1)
return 1
- if ("--quiet" in emerge_config.opts):
+ if "--quiet" in emerge_config.opts:
spinner.update = spinner.update_quiet
portage.util.noiselimit = -1
@@ -3085,7 +3085,7 @@ def run_action(emerge_config):
if "python-trace" in
emerge_config.target_config.settings.features:
portage.debug.set_trace(True)
- if not ("--quiet" in emerge_config.opts):
+ if not "--quiet" in emerge_config.opts:
if '--nospinner' in emerge_config.opts or \
emerge_config.target_config.settings.get('TERM') ==
'dumb' or \
not sys.stdout.isatty():
diff --git a/lib/_emerge/resolver/slot_collision.py
b/lib/_emerge/resolver/slot_collision.py
index 7536ce7a2..df3816717 100644
--- a/lib/_emerge/resolver/slot_collision.py
+++ b/lib/_emerge/resolver/slot_collision.py
@@ -138,8 +138,8 @@ class slot_conflict_handler:
config_gen = _configuration_generator(conflict_pkgs)
first_config = True
- #go through all configurations and collect solutions
- while(True):
+ #
[gentoo-portage-dev] [PATCH 5/6] tabcheck.py: fix multiple-imports
Signed-off-by: Aaron Bauman --- tabcheck.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tabcheck.py b/tabcheck.py index a28ad93d9..1df26785d 100755 --- a/tabcheck.py +++ b/tabcheck.py @@ -1,6 +1,7 @@ #!/usr/bin/python -b -import tabnanny,sys +import sys +import tabnanny for x in sys.argv: tabnanny.check(x) -- 2.28.0
[gentoo-portage-dev] [PATCH 6/6] pylintrc: enable multiple-imports check
Signed-off-by: Aaron Bauman --- pylintrc | 1 + 1 file changed, 1 insertion(+) diff --git a/pylintrc b/pylintrc index b7091516c..5f4ec3278 100644 --- a/pylintrc +++ b/pylintrc @@ -19,6 +19,7 @@ enable= misplaced-future, missing-final-newline, mixed-line-endings, +multiple-imports, redefined-builtin, reimported, relative-beyond-top-level, -- 2.28.0
[gentoo-portage-dev] [PATCH 2/6] lib/portage/elog/mod_custom.py: fix multiple-imports
Signed-off-by: Aaron Bauman --- lib/portage/elog/mod_custom.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/portage/elog/mod_custom.py b/lib/portage/elog/mod_custom.py index 836bdad62..7cfafeccc 100644 --- a/lib/portage/elog/mod_custom.py +++ b/lib/portage/elog/mod_custom.py @@ -2,7 +2,9 @@ # Copyright 2006-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -import portage.elog.mod_save, portage.process, portage.exception +import portage.elog.mod_save +import portage.exception +import portage.process def process(mysettings, key, logentries, fulltext): elogfilename = portage.elog.mod_save.process(mysettings, key, logentries, fulltext) -- 2.28.0
[gentoo-portage-dev] [PATCH 4/6] lib/portage/dep/__init__.py: fix multiple-imports
Signed-off-by: Aaron Bauman --- lib/portage/dep/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/portage/dep/__init__.py b/lib/portage/dep/__init__.py index 50266a21b..c0ed2dd3c 100644 --- a/lib/portage/dep/__init__.py +++ b/lib/portage/dep/__init__.py @@ -13,8 +13,10 @@ __all__ = [ '_repo_separator', '_slot_separator', ] -import re, sys +import re +import sys import warnings + from functools import lru_cache import portage -- 2.28.0
[gentoo-portage-dev] [PATCH 3/6] lib/portage/tests/runTests.py: fix multiple-imports
Signed-off-by: Aaron Bauman --- lib/portage/tests/runTests.py | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/portage/tests/runTests.py b/lib/portage/tests/runTests.py index d4d1f7c76..9514abebe 100755 --- a/lib/portage/tests/runTests.py +++ b/lib/portage/tests/runTests.py @@ -1,14 +1,15 @@ #!/usr/bin/python -bWd # runTests.py -- Portage Unit Test Functionality -# Copyright 2006-2014 Gentoo Foundation +# Copyright 2006-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -import os, sys -import os.path as osp import grp +import os +import os.path as osp import platform import pwd import signal +import sys def debug_signal(signum, frame): import pdb -- 2.28.0
[gentoo-portage-dev] [PATCH 1/6] lib/portage/elog/mod_mail.py: fix multiple-imports
Signed-off-by: Aaron Bauman --- lib/portage/elog/mod_mail.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/portage/elog/mod_mail.py b/lib/portage/elog/mod_mail.py index 4edf507eb..38eaa277f 100644 --- a/lib/portage/elog/mod_mail.py +++ b/lib/portage/elog/mod_mail.py @@ -2,7 +2,9 @@ # Copyright 2006-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -import portage.mail, socket +import portage.mail +import socket + from portage.exception import PortageException from portage.localization import _ from portage.util import writemsg -- 2.28.0
Re: [gentoo-dev] Packages up for grabs due to jlec being MIA
Michał Górny writes: >> The following packages are looking for a new maintainer: >> > > + cuda.eclass I would like to adopt this eclass on behalf of the science project. Yours, Benda signature.asc Description: PGP signature
Re: [gentoo-dev] Packages up for grabs due to jlec being MIA
I'll take sys-kernel/kergen [1] and net-analyzer/zmap [2] [1] https://github.com/gentoo/gentoo/pull/17016 [2] https://github.com/gentoo/gentoo/pull/17017 On 8/5/20 9:24 AM, Michał Górny wrote: > Hello, > > The following packages are looking for a new maintainer: > > [vB] app-backup/cachedir > [vB] app-benchmarks/bootchart2 > [ B] app-benchmarks/ramspeed > [ B] app-office/scribus > [vB] dev-lua/luaposix > [ b] net-analyzer/zmap > [ ] net-libs/czmq > [ ] net-vpn/vpncwatch > [vB] sys-block/blocks > [ ] sys-boot/makebootfat > [v ] sys-fs/aufs-headers > [vB] sys-fs/aufs-util > [vB] sys-fs/bcache-tools > [v ] sys-kernel/aufs-sources > [vB] sys-kernel/kergen > > Legend: > > v - needs version bump > b - has trivial (QA) bug reported > B - has non-trivial bug reported > -- Best regards, Jakov Smolic
[gentoo-dev] News item: Multiple root kernel command-line arguments
Hi, please review the news item below: - I am not 100% happy with the title but the 50 char limit doesn't allow any more details. - No Display-If condition because it is neither a genkernel nor kexec-tools issue. We maybe even have additional packages which are appending to kernel command-line I am not aware of. - In theory this shouldn't be a news for anyone: If you don't use a persistent device name, you are basically asking for troubles like that. However, people just using kexec from kexec-tools package maybe unaware that auto-detection of ROOT device which is the default might cause trouble like that because it won't use persistent names. - Experiencing a boot failure is always bad -- especially for headless/remote systems so a warning shouldn't hurt. - Latest kexec-tools ebuild in repository now also warns user in pkg_postinst, see https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild?id=61c03ffab76740c0420e3c8a3185d047d461f7a7#n111 --- Title: Multiple root kernel command-line arguments Author: Thomas Deutschmann Posted: 2020-08-05 Revision: 1 News-Item-Format: 2.0 Due to genkernel-4.1 development which is changing device manager from MDEV to (E)UDEV it was noticed that some tools like kexec append an additional root argument to kernel command-line. If these tools will set root to a non-persistent device name like root=/dev/dm-3, the next boot might fail if there is *no* root device named like that in start environment (i.e. initramfs). While kexec's runscript was changed in >=sys-apps/kexec-tools-2.0.20-r2 to no longer append root kernel command-line argument when an option like "--reuse-cmdline" (default) is used, a cold reboot *without* kexec maybe needed to restore kernel command-line. NOTE: This issue is *not* specific to kexec or genkernel usage. Kernel will always use last set root kernel command-line argument. Any tool which might be appending root argument without a persistent device name might cause a boot failure if system cannot find that referenced root device during boot. To avoid boot problems user should revise their current kernel command-line (/proc/cmdline) to ensure that only *one* root kernel command-line argument is set. The usage of persistent device names like root=UUID=<...> is highly recommended. -- Regards, Thomas Deutschmann / Gentoo Linux Developer C4DD 695F A713 8F24 2AA1 5638 5849 7EE5 1D5D 74A5 signature.asc Description: OpenPGP digital signature
Re: [gentoo-dev] Last-rites: dev-libs/liboobs
On Tuesday, 4 August 2020 01:27:17 CEST Jimi Huotari wrote: > I'd certainly be fine with this, and 'app-admin/system-tools-backends', > which is next on my list to go, to be assigned to maintainer-wanted > instead of being removed. Looking at the linked bug, the package was doomed in 2016, last-rites is inevitable. Regards signature.asc Description: This is a digitally signed message part.
Re: [gentoo-dev] Last-rites: dev-libs/liboobs
On Tuesday, 4 August 2020 00:23:44 CEST Peter Stuge wrote: > Jimi Huotari wrote: > > # Jimi Huotari (2020-08-04) > > # No consumers since 2015, and no known stand-alone use. > > # Removal in 30 days. > > dev-libs/liboobs > > Wut - isn't that a really poor reason to remove from the tree? :\ > > Why not just keep it unless there is an actual technical problem? > (Security, maintainability, etc.) If there is, then please mention it. If you know a reason to keep it, please mention it. Otherwise, a non-high-profile library that had no consumers in 2015 has no business of staying in tree in 2020. I rather have the current maintainer, fully aware of its redundancy, send those last-rites instead of effectively asking a poor random dev in the future to completely unnecessarily waste time on maintenance or do the necessary research before removing it. Regards signature.asc Description: This is a digitally signed message part.
Re: [gentoo-dev] Packages up for grabs due to jlec being MIA
On Wed, 2020-08-05 at 09:24 +0200, Michał Górny wrote: > Hello, > > The following packages are looking for a new maintainer: > + cuda.eclass -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
[gentoo-dev] Packages up for grabs due to jlec being MIA
Hello, The following packages are looking for a new maintainer: [vB] app-backup/cachedir [vB] app-benchmarks/bootchart2 [ B] app-benchmarks/ramspeed [ B] app-office/scribus [vB] dev-lua/luaposix [ b] net-analyzer/zmap [ ] net-libs/czmq [ ] net-vpn/vpncwatch [vB] sys-block/blocks [ ] sys-boot/makebootfat [v ] sys-fs/aufs-headers [vB] sys-fs/aufs-util [vB] sys-fs/bcache-tools [v ] sys-kernel/aufs-sources [vB] sys-kernel/kergen Legend: v - needs version bump b - has trivial (QA) bug reported B - has non-trivial bug reported -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
