From 1ffd14b3212f1fafd087dadc7a1a8548f53c6cab Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 9 Mar 2023 19:08:31 +0000 Subject: portageOutput -> p_out --- src/backend/autoremove.py | 4 ++-- src/backend/download.py | 8 ++++---- src/backend/getenv.py | 6 +++--- src/backend/install.py | 4 ++-- src/backend/solvedeps.py | 44 ++++++++++++++++++++++---------------------- src/backend/uninstall.py | 4 ++-- src/backend/upgrade.py | 4 ++-- 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/backend/autoremove.py b/src/backend/autoremove.py index ab2471b..4dd56d2 100644 --- a/src/backend/autoremove.py +++ b/src/backend/autoremove.py @@ -28,8 +28,8 @@ def xstart(): # kill portage if the program dies or it's terminated by the user atexit.register(sisyphus.killemerge.start, p_exe) - for portageOutput in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): - print(portageOutput.rstrip()) + for p_out in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): + print(p_out.rstrip()) p_exe.wait() sisyphus.syncdb.localTable() diff --git a/src/backend/download.py b/src/backend/download.py index 661e1ea..fb54b4d 100644 --- a/src/backend/download.py +++ b/src/backend/download.py @@ -48,8 +48,8 @@ def xpkgbinpkgonly(): # kill portage if the program dies or it's terminated by the user atexit.register(sisyphus.killemerge.start, p_exe) - for portageOutput in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): - print(portageOutput.rstrip()) + for p_out in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): + print(p_out.rstrip()) p_exe.wait() @@ -93,7 +93,7 @@ def xworldbinpkgonly(): # kill portage if the program dies or it's terminated by the user atexit.register(sisyphus.killemerge.start, p_exe) - for portageOutput in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): - print(portageOutput.rstrip()) + for p_out in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): + print(p_out.rstrip()) p_exe.wait() diff --git a/src/backend/getenv.py b/src/backend/getenv.py index 9944d77..e478eb6 100644 --- a/src/backend/getenv.py +++ b/src/backend/getenv.py @@ -11,9 +11,9 @@ def binhostURL(): p_exe = subprocess.Popen( ['emerge', '--info', '--verbose'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - for portageOutput in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): - if "PORTAGE_BINHOST" in portageOutput: - binhostURL = portageOutput.rstrip().split("=")[1].strip('\"') + for p_out in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): + if "PORTAGE_BINHOST" in p_out: + binhostURL = p_out.rstrip().split("=")[1].strip('\"') p_exe.wait() return binhostURL diff --git a/src/backend/install.py b/src/backend/install.py index 6b577a2..a9cec1b 100644 --- a/src/backend/install.py +++ b/src/backend/install.py @@ -183,8 +183,8 @@ def xstart(pkgname): # kill portage if the program dies or it's terminated by the user atexit.register(sisyphus.killemerge.start, p_exe) - for portageOutput in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): - print(portageOutput.rstrip()) + for p_out in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): + print(p_out.rstrip()) p_exe.wait() sisyphus.syncdb.localTable() diff --git a/src/backend/solvedeps.py b/src/backend/solvedeps.py index 85f3115..c51ade0 100644 --- a/src/backend/solvedeps.py +++ b/src/backend/solvedeps.py @@ -16,29 +16,29 @@ def pkg(pkgname): '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = p_exe.communicate() - for portageOutput in stderr.decode('utf-8').splitlines(): - if "The following keyword changes are necessary to proceed:" in portageOutput: + for p_out in stderr.decode('utf-8').splitlines(): + if "The following keyword changes are necessary to proceed:" in p_out: needsConfig = int(1) - if "The following mask changes are necessary to proceed:" in portageOutput: + if "The following mask changes are necessary to proceed:" in p_out: needsConfig = int(1) - if "The following USE changes are necessary to proceed:" in portageOutput: + if "The following USE changes are necessary to proceed:" in p_out: needsConfig = int(1) - if "The following REQUIRED_USE flag constraints are unsatisfied:" in portageOutput: + if "The following REQUIRED_USE flag constraints are unsatisfied:" in p_out: needsConfig = int(1) - if "One of the following masked packages is required to complete your request:" in portageOutput: + if "One of the following masked packages is required to complete your request:" in p_out: needsConfig = int(1) - for portageOutput in stdout.decode('utf-8').splitlines(): - if "[binary" in portageOutput: - isBinary = portageOutput.split("]")[1].split("[")[0].strip(" ") + for p_out in stdout.decode('utf-8').splitlines(): + if "[binary" in p_out: + isBinary = p_out.split("]")[1].split("[")[0].strip(" ") areBinaries.append(isBinary) - if "[ebuild" in portageOutput: - isSource = portageOutput.split("]")[1].split("[")[0].strip(" ") + if "[ebuild" in p_out: + isSource = p_out.split("]")[1].split("[")[0].strip(" ") areSources.append(isSource) pickle.dump([areBinaries, areSources, needsConfig], open(os.path.join( @@ -54,29 +54,29 @@ def world(): '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = p_exe.communicate() - for portageOutput in stderr.decode('utf-8').splitlines(): - if "The following keyword changes are necessary to proceed:" in portageOutput: + for p_out in stderr.decode('utf-8').splitlines(): + if "The following keyword changes are necessary to proceed:" in p_out: needsConfig = int(1) - if "The following mask changes are necessary to proceed:" in portageOutput: + if "The following mask changes are necessary to proceed:" in p_out: needsConfig = int(1) - if "The following USE changes are necessary to proceed:" in portageOutput: + if "The following USE changes are necessary to proceed:" in p_out: needsConfig = int(1) - if "The following REQUIRED_USE flag constraints are unsatisfied:" in portageOutput: + if "The following REQUIRED_USE flag constraints are unsatisfied:" in p_out: needsConfig = int(1) - if "One of the following masked packages is required to complete your request:" in portageOutput: + if "One of the following masked packages is required to complete your request:" in p_out: needsConfig = int(1) - for portageOutput in stdout.decode('utf-8').splitlines(): - if "[binary" in portageOutput: - isBinary = portageOutput.split("]")[1].split("[")[0].strip(" ") + for p_out in stdout.decode('utf-8').splitlines(): + if "[binary" in p_out: + isBinary = p_out.split("]")[1].split("[")[0].strip(" ") areBinaries.append(isBinary) - if "[ebuild" in portageOutput: - isSource = portageOutput.split("]")[1].split("[")[0].strip(" ") + if "[ebuild" in p_out: + isSource = p_out.split("]")[1].split("[")[0].strip(" ") areSources.append(isSource) pickle.dump([areBinaries, areSources, needsConfig], open(os.path.join( diff --git a/src/backend/uninstall.py b/src/backend/uninstall.py index 3d31da5..de58fa3 100644 --- a/src/backend/uninstall.py +++ b/src/backend/uninstall.py @@ -40,8 +40,8 @@ def xstart(pkgname): # kill portage if the program dies or it's terminated by the user atexit.register(sisyphus.killemerge.start, p_exe) - for portageOutput in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): - print(portageOutput.rstrip()) + for p_out in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): + print(p_out.rstrip()) p_exe.wait() sisyphus.syncdb.localTable() diff --git a/src/backend/upgrade.py b/src/backend/upgrade.py index fbd23d3..dacfcd7 100644 --- a/src/backend/upgrade.py +++ b/src/backend/upgrade.py @@ -188,8 +188,8 @@ def xstart(): # kill portage if the program dies or it's terminated by the user atexit.register(sisyphus.killemerge.start, p_exe) - for portageOutput in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): - print(portageOutput.rstrip()) + for p_out in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): + print(p_out.rstrip()) p_exe.wait() sisyphus.syncdb.localTable() -- cgit v1.2.3