From 0d91cc6b22cebededd3bf66ad594ef0420933aff Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 9 Apr 2023 14:22:24 +0100
Subject: rewrite upgrade; cleaner API : one entrypoint instead of three,
handle keyboard interrupt gracefully
---
src/backend/install.py | 2 +-
src/backend/upgrade.py | 312 +++++++++++++++++++++------------------
src/frontend/cli/sisyphus-cli.py | 6 +-
src/frontend/gui/sisyphus-gui.py | 2 +-
4 files changed, 174 insertions(+), 148 deletions(-)
(limited to 'src')
diff --git a/src/backend/install.py b/src/backend/install.py
index d9f3e61..3c9133c 100644
--- a/src/backend/install.py
+++ b/src/backend/install.py
@@ -4,8 +4,8 @@ import atexit
import io
import os
import pickle
-import subprocess
import signal
+import subprocess
import sys
import sisyphus.checkenv
import sisyphus.download
diff --git a/src/backend/upgrade.py b/src/backend/upgrade.py
index bffcf2d..58049d8 100644
--- a/src/backend/upgrade.py
+++ b/src/backend/upgrade.py
@@ -4,6 +4,7 @@ import atexit
import io
import os
import pickle
+import signal
import subprocess
import sys
import sisyphus.checkenv
@@ -16,177 +17,202 @@ import sisyphus.syncdb
import sisyphus.update
-def start():
- if sisyphus.checkenv.root():
- sisyphus.update.start(gfx_ui=False)
- sisyphus.solvedeps.start()
- bin_list, src_list, need_cfg = pickle.load(
- open(os.path.join(sisyphus.getfs.p_mtd_dir, "sisyphus_worlddeps.pickle"), "rb"))
+def sigint_handler(signal, frame):
+ sys.exit(0)
- if need_cfg == 0:
- if len(src_list) == 0:
- if not len(bin_list) == 0:
- os.chdir(sisyphus.getfs.p_cch_dir)
- print("\n" + sisyphus.getcolor.green + "These are the binary packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.magenta + ", ".join(
- bin_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n")
- while True:
- 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', '']:
- sisyphus.download.start(
- dl_world=True, gfx_ui=False)
- 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.lcl_tbl()
- break
- elif user_input.lower() in ['no', 'n']:
- break
- sys.exit()
- else:
- print("\nSorry, response" + " " + "'" +
- user_input + "'" + " " + "not understood.\n")
- continue
- else:
- print(sisyphus.getcolor.bright_red +
- "\nNo package upgrades found!\n" + sisyphus.getcolor.reset)
- sys.exit()
- else:
- print(sisyphus.getcolor.bright_red +
- "\nSource package(s) found in the mix!\n" + sisyphus.getcolor.reset)
- print(sisyphus.getcolor.bright_yellow + "Use" +
- sisyphus.getcolor.reset + " " + "'" + "sisyphus upgrade --ebuild" + "'")
- sys.exit()
- else:
- # don't silently fail if a source package requested without the --ebuild option needs a keyword, mask, REQUIRED_USE or USE change
- print(sisyphus.getcolor.bright_red +
- "\nInvalid request!\n" + sisyphus.getcolor.reset)
- print(sisyphus.getcolor.bright_yellow + "Use" +
- sisyphus.getcolor.reset + " " + "'" + "sisyphus upgrade --ebuild" + "'")
- sys.exit()
- else:
+
+signal.signal(signal.SIGINT, sigint_handler)
+
+
+def start(ebuild=False, gfx_ui=False):
+ if not sisyphus.checkenv.root():
print(sisyphus.getcolor.bright_red +
"\nYou need root permissions to do this!\n" + sisyphus.getcolor.reset)
sys.exit()
+ else:
+ if gfx_ui:
+ sisyphus.solvedeps.start.__wrapped__() # undecorate
+ else:
+ sisyphus.update.start(gfx_ui=False)
+ sisyphus.solvedeps.start()
-
-def estart():
- if sisyphus.checkenv.root():
- sisyphus.update.start(gfx_ui=False)
- sisyphus.solvedeps.start()
bin_list, src_list, need_cfg = pickle.load(
open(os.path.join(sisyphus.getfs.p_mtd_dir, "sisyphus_worlddeps.pickle"), "rb"))
- if need_cfg == 0:
- if len(src_list) == 0:
- if not len(bin_list) == 0:
- os.chdir(sisyphus.getfs.p_cch_dir)
- print("\n" + sisyphus.getcolor.green + "These are the binary packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.magenta + ", ".join(
- bin_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n")
- while True:
- 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', '']:
- sisyphus.download.start(
- dl_world=True, gfx_ui=False)
- 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'])
+ if need_cfg != 0:
+ 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'])
+ try:
+ p_exe.wait()
+ except KeyboardInterrupt:
+ p_exe.terminate()
+ try:
+ p_exe.wait(1)
+ except subprocess.TimeoutExpired:
+ p_exe.kill()
+ sys.exit()
+ print(sisyphus.getcolor.bright_red +
+ "\nCannot proceed!\n" + sisyphus.getcolor.reset)
+ print(sisyphus.getcolor.bright_yellow +
+ "Apply the above changes to your portage configuration files and try again" + sisyphus.getcolor.reset)
+ sys.exit()
+ else:
+ if len(bin_list) == 0 and len(src_list) == 0:
+ if gfx_ui:
+ print("\nNo package upgrades found!\n")
+ else:
+ print(sisyphus.getcolor.bright_red +
+ "\nNo package upgrades found!\n" + sisyphus.getcolor.reset)
+ sys.exit()
+
+ if ebuild: # ebuild mode
+ if len(bin_list) == 0 and len(src_list) != 0: # source only
+ print("\n" + sisyphus.getcolor.green + "These are the source packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.green + ", ".join(
+ src_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(src_list)) + " " + "source package(s)" + sisyphus.getcolor.reset + "\n")
+ while True:
+ 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', '']:
+ p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse',
+ '--backtrack=100', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n', '@world'])
+ try:
p_exe.wait()
- sisyphus.syncdb.lcl_tbl()
- break
- elif user_input.lower() in ['no', 'n']:
- break
+ except KeyboardInterrupt:
+ p_exe.terminate()
+ try:
+ p_exe.wait(1)
+ except subprocess.TimeoutExpired:
+ p_exe.kill()
sys.exit()
- else:
- print("\nSorry, response" + " " + "'" +
- user_input + "'" + " " + "not understood.\n")
- continue
+ sisyphus.syncdb.lcl_tbl()
+ break
+ elif user_input.lower() in ['no', 'n']:
+ break
+ else:
+ print("\nSorry, response" + " " + "'" +
+ user_input + "'" + " " + "not understood.\n")
+ continue
+ elif len(bin_list) != 0 and len(src_list) != 0: # binary and source
+ print("\n" + sisyphus.getcolor.green + "These are the binary packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.magenta + ", ".join(
+ bin_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n")
+ print("\n" + sisyphus.getcolor.green + "These are the source packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.green + ", ".join(
+ src_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(src_list)) + " " + "source package(s)" + sisyphus.getcolor.reset + "\n")
+ while True:
+ 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', '']:
+ sisyphus.download.start(dl_world=True, gfx_ui=False)
+ os.chdir(sisyphus.getfs.p_cch_dir)
+ 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'])
+ try:
+ p_exe.wait()
+ except KeyboardInterrupt:
+ p_exe.terminate()
+ try:
+ p_exe.wait(1)
+ except subprocess.TimeoutExpired:
+ p_exe.kill()
+ sys.exit()
+ sisyphus.syncdb.lcl_tbl()
+ break
+ elif user_input.lower() in ['no', 'n']:
+ break
+ else:
+ print("\nSorry, response" + " " + "'" +
+ user_input + "'" + " " + "not understood.\n")
+ continue
+ elif len(bin_list) != 0 and len(src_list) == 0: # binary only (fallback)
+ print("\n" + sisyphus.getcolor.green + "These are the binary packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.magenta + ", ".join(
+ bin_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n")
+ while True:
+ 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', '']:
+ sisyphus.download.start(dl_world=True, gfx_ui=False)
+ os.chdir(sisyphus.getfs.p_cch_dir)
+ 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'])
+ try:
+ p_exe.wait()
+ except KeyboardInterrupt:
+ p_exe.terminate()
+ try:
+ p_exe.wait(1)
+ except subprocess.TimeoutExpired:
+ p_exe.kill()
+ sys.exit()
+ sisyphus.syncdb.lcl_tbl()
+ break
+ elif user_input.lower() in ['no', 'n']:
+ break
+ else:
+ print("\nSorry, response" + " " + "'" +
+ user_input + "'" + " " + "not understood.\n")
+ continue
+ else: # non-ebuild mode
+ if len(bin_list) == 0 and len(src_list) != 0: # source only (noop)
+ if gfx_ui:
+ print("\n" + "Source package(s) found in the mix;" + " " + "Use sisyphus CLI:" + " " + "'" +
+ "sisyphus upgrade --ebuild" + "'" + " " + "to perform the upgrade;" + " " + "Aborting." + "\n")
else:
print(sisyphus.getcolor.bright_red +
- "\nNo package upgrades found!\n" + sisyphus.getcolor.reset)
+ "\nSource package(s) found in the mix!\n" + sisyphus.getcolor.reset)
+ print(sisyphus.getcolor.bright_yellow + "Use" +
+ sisyphus.getcolor.reset + " " + "'" + "sisyphus upgrade --ebuild" + "'")
sys.exit()
- else:
- if not len(bin_list) == 0:
+ elif len(bin_list) != 0 and len(src_list) != 0: # binary and source (noop)
+ if gfx_ui:
+ print("\n" + "Source package(s) found in the mix;" + " " + "Use sisyphus CLI:" + " " + "'" +
+ "sisyphus upgrade --ebuild" + "'" + " " + "to perform the upgrade;" + " " + "Aborting." + "\n")
+ else:
+ print(sisyphus.getcolor.bright_red +
+ "\nSource package(s) found in the mix!\n" + sisyphus.getcolor.reset)
+ print(sisyphus.getcolor.bright_yellow + "Use" +
+ sisyphus.getcolor.reset + " " + "'" + "sisyphus upgrade --ebuild" + "'")
+ sys.exit()
+ elif len(bin_list) != 0 and len(src_list) == 0: # binary only
+ if gfx_ui:
+ print("\n" + "These are the binary packages that will be merged, in order:" + "\n\n" + ", ".join(
+ bin_list) + "\n\n" + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + "\n\n")
+ sisyphus.download.start(dl_world=True, gfx_ui=True)
os.chdir(sisyphus.getfs.p_cch_dir)
+ 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, p_exe)
+
+ for p_out in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"):
+ print(p_out.rstrip())
+
+ p_exe.wait()
+ sisyphus.syncdb.lcl_tbl()
+ else:
print("\n" + sisyphus.getcolor.green + "These are the binary packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.magenta + ", ".join(
bin_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n")
- print("\n" + sisyphus.getcolor.green + "These are the source packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.green + ", ".join(
- src_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(src_list)) + " " + "source package(s)" + sisyphus.getcolor.reset + "\n")
while True:
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', '']:
sisyphus.download.start(
dl_world=True, gfx_ui=False)
- p_exe = subprocess.Popen(['emerge', '--quiet', '--verbose', '--update', '--deep', '--newuse', '--usepkg',
+ os.chdir(sisyphus.getfs.p_cch_dir)
+ 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.lcl_tbl()
- break
- elif user_input.lower() in ['no', 'n']:
- break
- sys.exit()
- else:
- print("\nSorry, response" + " " + "'" +
- user_input + "'" + " " + "not understood.\n")
- continue
- else:
- print("\n" + sisyphus.getcolor.green + "These are the source packages that would be merged, in order:" + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.green + ", ".join(
- src_list) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(src_list)) + " " + "source package(s)" + sisyphus.getcolor.reset + "\n")
- while True:
- 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', '']:
- 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()
+ try:
+ p_exe.wait()
+ except KeyboardInterrupt:
+ p_exe.terminate()
+ try:
+ p_exe.wait(1)
+ except subprocess.TimeoutExpired:
+ p_exe.kill()
+ sys.exit()
sisyphus.syncdb.lcl_tbl()
break
elif user_input.lower() in ['no', 'n']:
break
- sys.exit()
else:
print("\nSorry, response" + " " + "'" +
user_input + "'" + " " + "not understood.\n")
continue
- else:
- 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 +
- "Apply the above changes to your portage configuration files and try again" + sisyphus.getcolor.reset)
- sys.exit()
- else:
- print(sisyphus.getcolor.bright_red +
- "\nYou need root permissions to do this!\n" + sisyphus.getcolor.reset)
- sys.exit()
-
-
-def xstart():
- sisyphus.solvedeps.start.__wrapped__() # undecorate
- bin_list, src_list, need_cfg = pickle.load(
- open(os.path.join(sisyphus.getfs.p_mtd_dir, "sisyphus_worlddeps.pickle"), "rb"))
-
- if not len(src_list) == 0:
- print("\n" + "Source package(s) found in the mix;" + " " + "Use sisyphus CLI:" + " " + "'" +
- "sisyphus upgrade --ebuild" + "'" + " " + "to perform the upgrade;" + " " + "Aborting." + "\n")
- else:
- if not len(bin_list) == 0:
- os.chdir(sisyphus.getfs.p_cch_dir)
- print("\n" + "These are the binary packages that will be merged, in order:" + "\n\n" + ", ".join(
- bin_list) + "\n\n" + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + "\n\n")
- sisyphus.download.start(dl_world=True, gfx_ui=True)
- 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, p_exe)
-
- for p_out in io.TextIOWrapper(p_exe.stdout, encoding="utf-8"):
- print(p_out.rstrip())
-
- p_exe.wait()
- sisyphus.syncdb.lcl_tbl()
- else:
- print("\nNo package upgrades found!\n")
diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py
index 76a8cb2..6ccf587 100755
--- a/src/frontend/cli/sisyphus-cli.py
+++ b/src/frontend/cli/sisyphus-cli.py
@@ -217,10 +217,10 @@ def upgrade(ebuild: bool = typer.Option(False, "--ebuild", "-e")):
The --ebuild option will preffer to reuse binary packages(if available) to satisfy the dependencies for the ebuild(source) packages, speeding up the upgrade.
You can use the --ebuild option even if you don't have any ebuild(source) packages installed; It will fall back to binary packages only.
"""
- if not ebuild:
- sisyphus.upgrade.start()
+ if ebuild:
+ sisyphus.upgrade.start(ebuild=True, gfx_ui=False)
else:
- sisyphus.upgrade.estart()
+ sisyphus.upgrade.start(ebuild=False, gfx_ui=False)
@app.command("spmsync")
def spmsync():
diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py
index 8b8f451..9199510 100644
--- a/src/frontend/gui/sisyphus-gui.py
+++ b/src/frontend/gui/sisyphus-gui.py
@@ -411,7 +411,7 @@ class MainWorker(QtCore.QObject):
@QtCore.pyqtSlot()
def startUpgrade(self):
self.started.emit()
- sisyphus.upgrade.xstart()
+ sisyphus.upgrade.start(ebuild=False, gfx_ui=True)
self.finished.emit()
@QtCore.pyqtSlot()
--
cgit v1.2.3