From 1965c85d0acc683e1dddb58cec343b2ff62711e4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Nov 2022 13:35:41 +0000 Subject: change pickle database names --- src/backend/download.py | 4 ++-- src/backend/install.py | 6 +++--- src/backend/solvedeps.py | 4 ++-- src/backend/upgrade.py | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/backend/download.py b/src/backend/download.py index e74258f..a66d969 100644 --- a/src/backend/download.py +++ b/src/backend/download.py @@ -9,7 +9,7 @@ import sisyphus.getfs def pkg(pkgname): binhostURL = sisyphus.getenv.binhostURL() - areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_solvedeps_pkg.pickle"), "rb")) + areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "rb")) for index, binary in enumerate([package + '.tbz2' for package in areBinaries], start=1): print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary.replace('.tbz2', ' ')) @@ -28,7 +28,7 @@ def pkg(pkgname): def world(): binhostURL = sisyphus.getenv.binhostURL() - areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_solvedeps_world.pickle"), "rb")) + areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb")) for index, binary in enumerate([package + '.tbz2' for package in areBinaries], start=1): print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary.replace('.tbz2', ' ')) diff --git a/src/backend/install.py b/src/backend/install.py index 0d0b91d..64395bb 100644 --- a/src/backend/install.py +++ b/src/backend/install.py @@ -19,7 +19,7 @@ def start(pkgname): if sisyphus.checkenv.root(): sisyphus.update.start() sisyphus.solvedeps.pkg(pkgname) - areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_solvedeps_pkg.pickle"), "rb")) + areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "rb")) if needsConfig == 0: if len(areSources) == 0: @@ -48,7 +48,7 @@ def estart(pkgname): if sisyphus.checkenv.root(): sisyphus.update.start() sisyphus.solvedeps.pkg(pkgname) - areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_solvedeps_pkg.pickle"), "rb")) + areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "rb")) if needsConfig == 0: if len(areSources) == 0: @@ -94,7 +94,7 @@ def estart(pkgname): def xstart(pkgname): sisyphus.solvedeps.pkg.__wrapped__(pkgname) #undecorate - areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_solvedeps_pkg.pickle"), "rb")) + areBinaries,areSources,needsConfig = 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") diff --git a/src/backend/solvedeps.py b/src/backend/solvedeps.py index 35454c2..9ad9aca 100644 --- a/src/backend/solvedeps.py +++ b/src/backend/solvedeps.py @@ -37,7 +37,7 @@ def pkg(pkgname): isSource = portageOutput.split("]")[1].split("[")[0].strip(" ") areSources.append(isSource) - pickle.dump([areBinaries,areSources,needsConfig], open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_solvedeps_pkg.pickle"), "wb")) + pickle.dump([areBinaries,areSources,needsConfig], open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_pkgdeps.pickle"), "wb")) @animation.wait('resolving dependencies') @@ -70,4 +70,4 @@ def world(): isSource = portageOutput.split("]")[1].split("[")[0].strip(" ") areSources.append(isSource) - pickle.dump([areBinaries,areSources,needsConfig], open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_solvedeps_world.pickle"), "wb")) + pickle.dump([areBinaries,areSources,needsConfig], open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "wb")) diff --git a/src/backend/upgrade.py b/src/backend/upgrade.py index 738be54..f0468ed 100644 --- a/src/backend/upgrade.py +++ b/src/backend/upgrade.py @@ -19,7 +19,7 @@ def start(): if sisyphus.checkenv.root(): sisyphus.update.start() sisyphus.solvedeps.world() - areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_solvedeps_world.pickle"), "rb")) + areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb")) if needsConfig == 0: if len(areSources) == 0: @@ -48,7 +48,7 @@ def estart(): if sisyphus.checkenv.root(): sisyphus.update.start() sisyphus.solvedeps.world() - areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_solvedeps_world.pickle"), "rb")) + areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb")) if needsConfig == 0: if len(areSources) == 0: @@ -94,7 +94,7 @@ def estart(): def xstart(): sisyphus.solvedeps.world.__wrapped__() #undecorate - areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_solvedeps_world.pickle"), "rb")) + areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_worlddeps.pickle"), "rb")) if not len(areSources) == 0: print("\n" + "Source package(s) found in the mix;" + " " + "Use sisyphus CLI:" + " " + "'" + "sisyphus upgrade --ebuild" + "'" + " " + "to perform the upgrade;" + " " + "Aborting." + "\n") -- cgit v1.2.3