From 36e2fca70465e2e658570bcdf276d5ca644125bb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 9 Mar 2023 19:05:15 +0000 Subject: portageExec -> p_exe --- src/backend/autoremove.py | 12 ++++++------ src/backend/download.py | 46 +++++++++++++++++++++++----------------------- src/backend/getenv.py | 6 +++--- src/backend/install.py | 38 +++++++++++++++++++------------------- src/backend/solvedeps.py | 12 ++++++------ src/backend/uninstall.py | 16 ++++++++-------- src/backend/upgrade.py | 40 ++++++++++++++++++++-------------------- 7 files changed, 85 insertions(+), 85 deletions(-) diff --git a/src/backend/autoremove.py b/src/backend/autoremove.py index 8dc00ec..ab2471b 100644 --- a/src/backend/autoremove.py +++ b/src/backend/autoremove.py @@ -12,9 +12,9 @@ import sisyphus.syncdb def start(): if sisyphus.checkenv.root(): - portageExec = subprocess.Popen( + p_exe = subprocess.Popen( ['emerge', '--quiet', '--depclean', '--ask']) - portageExec.wait() + p_exe.wait() sisyphus.syncdb.localTable() else: print(sisyphus.getcolor.bright_red + @@ -23,13 +23,13 @@ def start(): def xstart(): - portageExec = subprocess.Popen( + p_exe = subprocess.Popen( ['emerge', '--depclean'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) # kill portage if the program dies or it's terminated by the user - atexit.register(sisyphus.killemerge.start, portageExec) + atexit.register(sisyphus.killemerge.start, p_exe) - for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): + for portageOutput in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): print(portageOutput.rstrip()) - portageExec.wait() + p_exe.wait() sisyphus.syncdb.localTable() diff --git a/src/backend/download.py b/src/backend/download.py index fce0148..661e1ea 100644 --- a/src/backend/download.py +++ b/src/backend/download.py @@ -16,10 +16,10 @@ def pkgbinpkgonly(): for index, binary in enumerate(['=' + package for package in areBinaries]): fetchList.append(binary) - - portageExec = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly', - '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList)) - portageExec.wait() + + p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly', + '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList)) + p_exe.wait() def pkgbinpkg(): @@ -30,9 +30,9 @@ def pkgbinpkg(): for index, binary in enumerate(['=' + package for package in areBinaries]): fetchList.append(binary) - portageExec = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--fetchonly', - '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList)) - portageExec.wait() + p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--fetchonly', + '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList)) + p_exe.wait() def xpkgbinpkgonly(): @@ -43,15 +43,15 @@ def xpkgbinpkgonly(): for index, binary in enumerate(['=' + package for package in areBinaries]): fetchList.append(binary) - portageExec = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly', '--rebuilt-binaries', - '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList), stdout=subprocess.PIPE, stderr=subprocess.PIPE) + p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly', '--rebuilt-binaries', + '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList), stdout=subprocess.PIPE, stderr=subprocess.PIPE) # kill portage if the program dies or it's terminated by the user - atexit.register(sisyphus.killemerge.start, portageExec) + atexit.register(sisyphus.killemerge.start, p_exe) - for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): + for portageOutput in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): print(portageOutput.rstrip()) - portageExec.wait() + p_exe.wait() def worldbinpkgonly(): @@ -62,9 +62,9 @@ def worldbinpkgonly(): for index, binary in enumerate(['=' + package for package in areBinaries]): fetchList.append(binary) - portageExec = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly', - '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList)) - portageExec.wait() + p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly', + '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList)) + p_exe.wait() def worldbinpkg(): @@ -75,9 +75,9 @@ def worldbinpkg(): for index, binary in enumerate(['=' + package for package in areBinaries]): fetchList.append(binary) - portageExec = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--fetchonly', - '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList)) - portageExec.wait() + p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--fetchonly', + '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList)) + p_exe.wait() def xworldbinpkgonly(): @@ -88,12 +88,12 @@ def xworldbinpkgonly(): for index, binary in enumerate(['=' + package for package in areBinaries]): fetchList.append(binary) - portageExec = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly', '--rebuilt-binaries', - '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList), stdout=subprocess.PIPE, stderr=subprocess.PIPE) + p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly', '--rebuilt-binaries', + '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(fetchList), stdout=subprocess.PIPE, stderr=subprocess.PIPE) # kill portage if the program dies or it's terminated by the user - atexit.register(sisyphus.killemerge.start, portageExec) + atexit.register(sisyphus.killemerge.start, p_exe) - for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): + for portageOutput in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): print(portageOutput.rstrip()) - portageExec.wait() + p_exe.wait() diff --git a/src/backend/getenv.py b/src/backend/getenv.py index 56ee9ec..9944d77 100644 --- a/src/backend/getenv.py +++ b/src/backend/getenv.py @@ -8,13 +8,13 @@ import sisyphus.getfs def binhostURL(): binhostURL = [] - portageExec = subprocess.Popen( + p_exe = subprocess.Popen( ['emerge', '--info', '--verbose'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): + for portageOutput in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): if "PORTAGE_BINHOST" in portageOutput: binhostURL = portageOutput.rstrip().split("=")[1].strip('\"') - portageExec.wait() + p_exe.wait() return binhostURL diff --git a/src/backend/install.py b/src/backend/install.py index fdca205..6b577a2 100644 --- a/src/backend/install.py +++ b/src/backend/install.py @@ -34,9 +34,9 @@ def start(pkgname): "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ") if user_input.lower() in ['yes', 'y', '']: sisyphus.download.pkgbinpkgonly() - portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', - '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname)) - portageExec.wait() + p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', + '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname)) + p_exe.wait() sisyphus.syncdb.localTable() break elif user_input.lower() in ['no', 'n']: @@ -89,9 +89,9 @@ def estart(pkgname): "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ") if user_input.lower() in ['yes', 'y', '']: sisyphus.download.pkgbinpkgonly() - portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', - '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname)) - portageExec.wait() + p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', + '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname)) + p_exe.wait() sisyphus.syncdb.localTable() break elif user_input.lower() in ['no', 'n']: @@ -119,9 +119,9 @@ def estart(pkgname): "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ") if user_input.lower() in ['yes', 'y', '']: sisyphus.download.pkgbinpkg() - portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--rebuilt-binaries', - '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname)) - portageExec.wait() + p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--rebuilt-binaries', + '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname)) + p_exe.wait() sisyphus.syncdb.localTable() break elif user_input.lower() in ['no', 'n']: @@ -140,9 +140,9 @@ def estart(pkgname): user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " + "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ") if user_input.lower() in ['yes', 'y', '']: - portageExec = subprocess.Popen( + p_exe = subprocess.Popen( ['emerge', '--quiet', '--verbose', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname)) - portageExec.wait() + p_exe.wait() sisyphus.syncdb.localTable() break elif user_input.lower() in ['no', 'n']: @@ -155,9 +155,9 @@ def estart(pkgname): user_input + "'" + " " + "not understood!\n") continue else: - portageExec = subprocess.Popen(['emerge', '--quiet', '--pretend', '--getbinpkg', '--rebuilt-binaries', - '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname)) - portageExec.wait() + p_exe = subprocess.Popen(['emerge', '--quiet', '--pretend', '--getbinpkg', '--rebuilt-binaries', + '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname)) + p_exe.wait() print(sisyphus.getcolor.bright_red + "\nCannot proceed!\n" + sisyphus.getcolor.reset) print(sisyphus.getcolor.bright_yellow + @@ -178,13 +178,13 @@ def xstart(pkgname): print("\n" + "These are the binary packages that will be merged, in order:" + "\n\n" + ", ".join( areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n\n") sisyphus.download.xpkgbinpkgonly() - portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries', - '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries', + '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE) # kill portage if the program dies or it's terminated by the user - atexit.register(sisyphus.killemerge.start, portageExec) + atexit.register(sisyphus.killemerge.start, p_exe) - for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): + for portageOutput in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): print(portageOutput.rstrip()) - portageExec.wait() + p_exe.wait() sisyphus.syncdb.localTable() diff --git a/src/backend/solvedeps.py b/src/backend/solvedeps.py index 5e66465..85f3115 100644 --- a/src/backend/solvedeps.py +++ b/src/backend/solvedeps.py @@ -12,9 +12,9 @@ def pkg(pkgname): areBinaries = [] areSources = [] needsConfig = int() - portageExec = subprocess.Popen(['emerge', '--quiet', '--pretend', '--getbinpkg', '--rebuilt-binaries', '--with-bdeps=y', - '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname), stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = portageExec.communicate() + p_exe = subprocess.Popen(['emerge', '--quiet', '--pretend', '--getbinpkg', '--rebuilt-binaries', '--with-bdeps=y', + '--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: @@ -50,9 +50,9 @@ def world(): areBinaries = [] areSources = [] needsConfig = int() - portageExec = subprocess.Popen(['emerge', '--quiet', '--update', '--deep', '--newuse', '--pretend', '--getbinpkg', '--rebuilt-binaries', - '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = portageExec.communicate() + p_exe = subprocess.Popen(['emerge', '--quiet', '--update', '--deep', '--newuse', '--pretend', '--getbinpkg', '--rebuilt-binaries', + '--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: diff --git a/src/backend/uninstall.py b/src/backend/uninstall.py index 77fa479..3d31da5 100644 --- a/src/backend/uninstall.py +++ b/src/backend/uninstall.py @@ -12,9 +12,9 @@ import sisyphus.syncdb def start(pkgname): if sisyphus.checkenv.root(): - portageExec = subprocess.Popen( + p_exe = subprocess.Popen( ['emerge', '--quiet', '--depclean', '--ask'] + list(pkgname)) - portageExec.wait() + p_exe.wait() sisyphus.syncdb.localTable() else: print(sisyphus.getcolor.bright_red + @@ -24,9 +24,9 @@ def start(pkgname): def fstart(pkgname): if sisyphus.checkenv.root(): - portageExec = subprocess.Popen( + p_exe = subprocess.Popen( ['emerge', '--quiet', '--unmerge', '--ask'] + list(pkgname)) - portageExec.wait() + p_exe.wait() sisyphus.syncdb.localTable() else: print(sisyphus.getcolor.bright_red + @@ -35,13 +35,13 @@ def fstart(pkgname): def xstart(pkgname): - portageExec = subprocess.Popen( + p_exe = subprocess.Popen( ['emerge', '--depclean'] + pkgname, stdout=subprocess.PIPE, stderr=subprocess.PIPE) # kill portage if the program dies or it's terminated by the user - atexit.register(sisyphus.killemerge.start, portageExec) + atexit.register(sisyphus.killemerge.start, p_exe) - for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): + for portageOutput in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): print(portageOutput.rstrip()) - portageExec.wait() + p_exe.wait() sisyphus.syncdb.localTable() diff --git a/src/backend/upgrade.py b/src/backend/upgrade.py index 00400ce..fbd23d3 100644 --- a/src/backend/upgrade.py +++ b/src/backend/upgrade.py @@ -34,9 +34,9 @@ def start(): "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No " + sisyphus.getcolor.reset + "]" + " ") if user_input.lower() in ['yes', 'y', '']: sisyphus.download.worldbinpkgonly() - portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', - '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world']) - portageExec.wait() + p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', + '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world']) + p_exe.wait() sisyphus.syncdb.localTable() break elif user_input.lower() in ['no', 'n']: @@ -89,9 +89,9 @@ def estart(): "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ") if user_input.lower() in ['yes', 'y', '']: sisyphus.download.worldbinpkgonly() - portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', - '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world']) - portageExec.wait() + p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', + '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world']) + p_exe.wait() sisyphus.syncdb.localTable() break elif user_input.lower() in ['no', 'n']: @@ -119,9 +119,9 @@ def estart(): "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ") if user_input.lower() in ['yes', 'y', '']: sisyphus.download.worldbinpkg() - portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', - '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world']) - portageExec.wait() + p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', + '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world']) + p_exe.wait() sisyphus.syncdb.localTable() break elif user_input.lower() in ['no', 'n']: @@ -140,9 +140,9 @@ def estart(): user_input = input(sisyphus.getcolor.bright_white + "Would you like to proceed?" + sisyphus.getcolor.reset + " " + "[" + sisyphus.getcolor.bright_green + "Yes" + sisyphus.getcolor.reset + "/" + sisyphus.getcolor.bright_red + "No" + sisyphus.getcolor.reset + "]" + " ") if user_input.lower() in ['yes', 'y', '']: - portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--backtrack=100', - '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - portageExec.wait() + p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--backtrack=100', + '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + p_exe.wait() sisyphus.syncdb.localTable() break elif user_input.lower() in ['no', 'n']: @@ -155,9 +155,9 @@ def estart(): user_input + "'" + " " + "not understood.\n") continue else: - portageExec = subprocess.Popen(['emerge', '--quiet', '--update', '--deep', '--newuse', '--pretend', '--getbinpkg', - '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world']) - portageExec.wait() + p_exe = subprocess.Popen(['emerge', '--quiet', '--update', '--deep', '--newuse', '--pretend', '--getbinpkg', + '--rebuilt-binaries', '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world']) + p_exe.wait() print(sisyphus.getcolor.bright_red + "\nCannot proceed!\n" + sisyphus.getcolor.reset) print(sisyphus.getcolor.bright_yellow + @@ -183,15 +183,15 @@ def xstart(): print("\n" + "These are the binary packages that will be merged, in order:" + "\n\n" + ", ".join( areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n\n") sisyphus.download.xworldbinpkgonly() - portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries', - '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) + p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg', '--usepkgonly', '--rebuilt-binaries', + '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) # kill portage if the program dies or it's terminated by the user - atexit.register(sisyphus.killemerge.start, portageExec) + atexit.register(sisyphus.killemerge.start, p_exe) - for portageOutput in io.TextIOWrapper(portageExec.stdout, encoding="utf-8"): + for portageOutput in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"): print(portageOutput.rstrip()) - portageExec.wait() + p_exe.wait() sisyphus.syncdb.localTable() else: print("\nNo package upgrades found!\n") -- cgit v1.2.3