From 3b26461f072cc897ee233d18a32f3b0f0ea83c23 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 9 Mar 2023 20:28:31 +0000 Subject: fetchList -> dl_list; gentooRepoDir -> g_src_dir; redcoreRepoDir -> r_src_dir; portageConfigDir -> p_cfg_dir; portageCacheDir -> p_cch_dir; portageDistDir -> p_dst_dir; portageMetadataDir -> p_mtd_dir --- src/backend/upgrade.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/backend/upgrade.py') diff --git a/src/backend/upgrade.py b/src/backend/upgrade.py index c79adcc..66a9da4 100644 --- a/src/backend/upgrade.py +++ b/src/backend/upgrade.py @@ -21,12 +21,12 @@ def start(): sisyphus.update.start() sisyphus.solvedeps.world() bin_list, src_list, need_cfg = pickle.load(open(os.path.join( - sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb")) + 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.portageCacheDir) + 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: @@ -76,12 +76,12 @@ def estart(): sisyphus.update.start() sisyphus.solvedeps.world() bin_list, src_list, need_cfg = pickle.load(open(os.path.join( - sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb")) + 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.portageCacheDir) + 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: @@ -109,7 +109,7 @@ def estart(): sys.exit() else: if not len(bin_list) == 0: - os.chdir(sisyphus.getfs.portageCacheDir) + 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") 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( @@ -172,14 +172,14 @@ def estart(): def xstart(): sisyphus.solvedeps.world.__wrapped__() # undecorate bin_list, src_list, need_cfg = pickle.load(open(os.path.join( - sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb")) + 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.portageCacheDir) + 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.xworldbinpkgonly() -- cgit v1.2.3