From 7fc4f9f40d1f1a45164759d796da94c18aa1f51a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 9 Mar 2023 20:18:46 +0000 Subject: isSane -> is_sane; needsConfig -> need_cfg; isBinary -> is_bin; isSource -> is_src; areBinaries -> bin_list; areSources -> src_list --- src/backend/checkenv.py | 12 +++++------ src/backend/download.py | 24 +++++++++++----------- src/backend/install.py | 32 ++++++++++++++--------------- src/backend/solvedeps.py | 52 ++++++++++++++++++++++++------------------------ src/backend/update.py | 8 ++++---- src/backend/upgrade.py | 36 ++++++++++++++++----------------- 6 files changed, 82 insertions(+), 82 deletions(-) diff --git a/src/backend/checkenv.py b/src/backend/checkenv.py index 503df16..6c0be73 100644 --- a/src/backend/checkenv.py +++ b/src/backend/checkenv.py @@ -12,17 +12,17 @@ def root(): def sanity(): act_brch = sisyphus.getenv.sys_brch() bh_addr = sisyphus.getenv.bh_addr() - isSane = int() + is_sane = int() if "packages-next" in bh_addr: if act_brch == "next": - isSane = int(1) + is_sane = int(1) else: - isSane = int(0) + is_sane = int(0) else: if act_brch == "master": - isSane = int(1) + is_sane = int(1) else: - isSane = int(0) + is_sane = int(0) - return isSane + return is_sane diff --git a/src/backend/download.py b/src/backend/download.py index fb54b4d..f6f2651 100644 --- a/src/backend/download.py +++ b/src/backend/download.py @@ -11,10 +11,10 @@ import sisyphus.killemerge def pkgbinpkgonly(): fetchList = [] - areBinaries, areSources, needsConfig = pickle.load(open(os.path.join( + bin_list, src_list, need_cfg = pickle.load(open(os.path.join( sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "rb")) - for index, binary in enumerate(['=' + package for package in areBinaries]): + for index, binary in enumerate(['=' + package for package in bin_list]): fetchList.append(binary) p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly', @@ -24,10 +24,10 @@ def pkgbinpkgonly(): def pkgbinpkg(): fetchList = [] - areBinaries, areSources, needsConfig = pickle.load(open(os.path.join( + bin_list, src_list, need_cfg = pickle.load(open(os.path.join( sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "rb")) - for index, binary in enumerate(['=' + package for package in areBinaries]): + for index, binary in enumerate(['=' + package for package in bin_list]): fetchList.append(binary) p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--fetchonly', @@ -37,10 +37,10 @@ def pkgbinpkg(): def xpkgbinpkgonly(): fetchList = [] - areBinaries, areSources, needsConfig = pickle.load(open(os.path.join( + bin_list, src_list, need_cfg = pickle.load(open(os.path.join( sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "rb")) - for index, binary in enumerate(['=' + package for package in areBinaries]): + for index, binary in enumerate(['=' + package for package in bin_list]): fetchList.append(binary) p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly', '--rebuilt-binaries', @@ -56,10 +56,10 @@ def xpkgbinpkgonly(): def worldbinpkgonly(): fetchList = [] - areBinaries, areSources, needsConfig = pickle.load(open(os.path.join( + bin_list, src_list, need_cfg = pickle.load(open(os.path.join( sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb")) - for index, binary in enumerate(['=' + package for package in areBinaries]): + for index, binary in enumerate(['=' + package for package in bin_list]): fetchList.append(binary) p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly', @@ -69,10 +69,10 @@ def worldbinpkgonly(): def worldbinpkg(): fetchList = [] - areBinaries, areSources, needsConfig = pickle.load(open(os.path.join( + bin_list, src_list, need_cfg = pickle.load(open(os.path.join( sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb")) - for index, binary in enumerate(['=' + package for package in areBinaries]): + for index, binary in enumerate(['=' + package for package in bin_list]): fetchList.append(binary) p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--fetchonly', @@ -82,10 +82,10 @@ def worldbinpkg(): def xworldbinpkgonly(): fetchList = [] - areBinaries, areSources, needsConfig = pickle.load(open(os.path.join( + bin_list, src_list, need_cfg = pickle.load(open(os.path.join( sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb")) - for index, binary in enumerate(['=' + package for package in areBinaries]): + for index, binary in enumerate(['=' + package for package in bin_list]): fetchList.append(binary) p_exe = subprocess.Popen(['emerge', '--nodeps', '--quiet', '--verbose', '--getbinpkg', '--getbinpkgonly', '--fetchonly', '--rebuilt-binaries', diff --git a/src/backend/install.py b/src/backend/install.py index f4639eb..d3338bf 100644 --- a/src/backend/install.py +++ b/src/backend/install.py @@ -20,15 +20,15 @@ def start(pkgname): if sisyphus.checkenv.root(): sisyphus.update.start() sisyphus.solvedeps.pkg(pkgname) - areBinaries, areSources, needsConfig = pickle.load(open(os.path.join( + bin_list, src_list, need_cfg = pickle.load(open(os.path.join( sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "rb")) - if needsConfig == 0: - if len(areSources) == 0: - if not len(areBinaries) == 0: + if need_cfg == 0: + if len(src_list) == 0: + if not len(bin_list) == 0: os.chdir(sisyphus.getfs.portageCacheDir) 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( - areBinaries) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n") + 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 + "]" + " ") @@ -75,15 +75,15 @@ def estart(pkgname): if sisyphus.checkenv.root(): sisyphus.update.start() sisyphus.solvedeps.pkg(pkgname) - areBinaries, areSources, needsConfig = pickle.load(open(os.path.join( + bin_list, src_list, need_cfg = pickle.load(open(os.path.join( sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "rb")) - if needsConfig == 0: - if len(areSources) == 0: - if not len(areBinaries) == 0: + if need_cfg == 0: + if len(src_list) == 0: + if not len(bin_list) == 0: os.chdir(sisyphus.getfs.portageCacheDir) 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( - areBinaries) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n") + 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 + "]" + " ") @@ -108,12 +108,12 @@ def estart(pkgname): "\nNo package found!\n" + sisyphus.getcolor.reset) sys.exit() else: - if not len(areBinaries) == 0: + if not len(bin_list) == 0: os.chdir(sisyphus.getfs.portageCacheDir) 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( - areBinaries) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n") + 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( - areSources) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + sisyphus.getcolor.reset + "\n") + 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 + "]" + " ") @@ -135,7 +135,7 @@ def estart(pkgname): 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( - areSources) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + sisyphus.getcolor.reset + "\n") + 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 + "]" + " ") @@ -171,12 +171,12 @@ def estart(pkgname): def xstart(pkgname): sisyphus.solvedeps.pkg.__wrapped__(pkgname) # undecorate - areBinaries, areSources, needsConfig = pickle.load(open(os.path.join( + bin_list, src_list, need_cfg = pickle.load(open(os.path.join( sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "rb")) os.chdir(sisyphus.getfs.portageCacheDir) 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") + bin_list) + "\n\n" + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + "\n\n") sisyphus.download.xpkgbinpkgonly() 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) diff --git a/src/backend/solvedeps.py b/src/backend/solvedeps.py index c51ade0..bc6f4bc 100644 --- a/src/backend/solvedeps.py +++ b/src/backend/solvedeps.py @@ -9,75 +9,75 @@ import sisyphus.getfs @animation.wait('resolving dependencies') def pkg(pkgname): - areBinaries = [] - areSources = [] - needsConfig = int() + bin_list = [] + src_list = [] + need_cfg = int() 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 p_out in stderr.decode('utf-8').splitlines(): if "The following keyword changes are necessary to proceed:" in p_out: - needsConfig = int(1) + need_cfg = int(1) if "The following mask changes are necessary to proceed:" in p_out: - needsConfig = int(1) + need_cfg = int(1) if "The following USE changes are necessary to proceed:" in p_out: - needsConfig = int(1) + need_cfg = int(1) if "The following REQUIRED_USE flag constraints are unsatisfied:" in p_out: - needsConfig = int(1) + need_cfg = int(1) if "One of the following masked packages is required to complete your request:" in p_out: - needsConfig = int(1) + need_cfg = int(1) 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) + is_bin = p_out.split("]")[1].split("[")[0].strip(" ") + bin_list.append(is_bin) if "[ebuild" in p_out: - isSource = p_out.split("]")[1].split("[")[0].strip(" ") - areSources.append(isSource) + is_src = p_out.split("]")[1].split("[")[0].strip(" ") + src_list.append(is_src) - pickle.dump([areBinaries, areSources, needsConfig], open(os.path.join( + pickle.dump([bin_list, src_list, need_cfg], open(os.path.join( sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "wb")) @animation.wait('resolving dependencies') def world(): - areBinaries = [] - areSources = [] - needsConfig = int() + bin_list = [] + src_list = [] + need_cfg = int() 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 p_out in stderr.decode('utf-8').splitlines(): if "The following keyword changes are necessary to proceed:" in p_out: - needsConfig = int(1) + need_cfg = int(1) if "The following mask changes are necessary to proceed:" in p_out: - needsConfig = int(1) + need_cfg = int(1) if "The following USE changes are necessary to proceed:" in p_out: - needsConfig = int(1) + need_cfg = int(1) if "The following REQUIRED_USE flag constraints are unsatisfied:" in p_out: - needsConfig = int(1) + need_cfg = int(1) if "One of the following masked packages is required to complete your request:" in p_out: - needsConfig = int(1) + need_cfg = int(1) 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) + is_bin = p_out.split("]")[1].split("[")[0].strip(" ") + bin_list.append(is_bin) if "[ebuild" in p_out: - isSource = p_out.split("]")[1].split("[")[0].strip(" ") - areSources.append(isSource) + is_src = p_out.split("]")[1].split("[")[0].strip(" ") + src_list.append(is_src) - pickle.dump([areBinaries, areSources, needsConfig], open(os.path.join( + pickle.dump([bin_list, src_list, need_cfg], open(os.path.join( sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "wb")) diff --git a/src/backend/update.py b/src/backend/update.py index 2bd11b0..9ff637f 100644 --- a/src/backend/update.py +++ b/src/backend/update.py @@ -22,9 +22,9 @@ def syncAll(): def start(): act_brch = sisyphus.getenv.sys_brch() bh_addr = sisyphus.getenv.bh_addr() - isSane = sisyphus.checkenv.sanity() + is_sane = sisyphus.checkenv.sanity() - if isSane == 1: + if is_sane == 1: syncAll() else: if "packages-next" in bh_addr: @@ -40,9 +40,9 @@ def start(): def xstart(): act_brch = sisyphus.getenv.sys_brch() bh_addr = sisyphus.getenv.bh_addr() - isSane = sisyphus.checkenv.sanity() + is_sane = sisyphus.checkenv.sanity() - if isSane == 1: + if is_sane == 1: syncAll() else: if "packages-next" in bh_addr: diff --git a/src/backend/upgrade.py b/src/backend/upgrade.py index da51ee4..c79adcc 100644 --- a/src/backend/upgrade.py +++ b/src/backend/upgrade.py @@ -20,15 +20,15 @@ def start(): if sisyphus.checkenv.root(): sisyphus.update.start() sisyphus.solvedeps.world() - areBinaries, areSources, needsConfig = pickle.load(open(os.path.join( + bin_list, src_list, need_cfg = pickle.load(open(os.path.join( sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb")) - if needsConfig == 0: - if len(areSources) == 0: - if not len(areBinaries) == 0: + if need_cfg == 0: + if len(src_list) == 0: + if not len(bin_list) == 0: os.chdir(sisyphus.getfs.portageCacheDir) 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( - areBinaries) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n") + 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 + "]" + " ") @@ -75,15 +75,15 @@ def estart(): if sisyphus.checkenv.root(): sisyphus.update.start() sisyphus.solvedeps.world() - areBinaries, areSources, needsConfig = pickle.load(open(os.path.join( + bin_list, src_list, need_cfg = pickle.load(open(os.path.join( sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb")) - if needsConfig == 0: - if len(areSources) == 0: - if not len(areBinaries) == 0: + if need_cfg == 0: + if len(src_list) == 0: + if not len(bin_list) == 0: os.chdir(sisyphus.getfs.portageCacheDir) 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( - areBinaries) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n") + 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 + "]" + " ") @@ -108,12 +108,12 @@ def estart(): "\nNo package upgrades found!\n" + sisyphus.getcolor.reset) sys.exit() else: - if not len(areBinaries) == 0: + if not len(bin_list) == 0: os.chdir(sisyphus.getfs.portageCacheDir) 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( - areBinaries) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + sisyphus.getcolor.reset + "\n") + 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( - areSources) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + sisyphus.getcolor.reset + "\n") + 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 + "]" + " ") @@ -135,7 +135,7 @@ def estart(): 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( - areSources) + sisyphus.getcolor.reset + "\n\n" + sisyphus.getcolor.bright_white + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + sisyphus.getcolor.reset + "\n") + 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 + "]" + " ") @@ -171,17 +171,17 @@ def estart(): def xstart(): sisyphus.solvedeps.world.__wrapped__() # undecorate - areBinaries, areSources, needsConfig = pickle.load(open(os.path.join( + bin_list, src_list, need_cfg = pickle.load(open(os.path.join( sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb")) - if not len(areSources) == 0: + 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(areBinaries) == 0: + if not len(bin_list) == 0: os.chdir(sisyphus.getfs.portageCacheDir) 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") + bin_list) + "\n\n" + "Total:" + " " + str(len(bin_list)) + " " + "binary package(s)" + "\n\n") sisyphus.download.xworldbinpkgonly() 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) -- cgit v1.2.3