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):
+ #
