summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-11-04 01:17:57 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-11-04 01:17:57 +0000
commitaebc9aec0b456a848c4266c76b5aa8c20b0ccaaf (patch)
tree4a7a62e0dd2a9a4d46ec7d05c928873f38ed38e2 /src
parent30f0ed9e0fa8b93b98ce707b4b432c3959dc764c (diff)
Revert "backend : maintain some consistency, shave off some more lines of code"
This reverts commit 30f0ed9e0fa8b93b98ce707b4b432c3959dc764c.
Diffstat (limited to 'src')
-rw-r--r--src/backend/download.py25
-rw-r--r--src/backend/install.py8
2 files changed, 21 insertions, 12 deletions
diff --git a/src/backend/download.py b/src/backend/download.py
index e21d068..c48b9d2 100644
--- a/src/backend/download.py
+++ b/src/backend/download.py
@@ -7,8 +7,10 @@ import wget
import sisyphus.getenv
import sisyphus.getfs
+def package(pkgname):
+ binhostURL = sisyphus.getenv.binhostURL()
+ areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_solvedeps_pkg.pickle"), "rb"))
-def fetchAll():
for index, binary in enumerate([package + '.tbz2' for package in areBinaries], start=1):
print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary)
wget.download(binhostURL + binary)
@@ -24,13 +26,20 @@ def fetchAll():
os.remove(binary.rstrip().split("/")[1])
-def pkg(pkgname):
- binhostURL = sisyphus.getenv.binhostURL()
- areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_solvedeps_pkg.pickle"), "rb"))
- fetchAll()
-
-
def world():
binhostURL = sisyphus.getenv.binhostURL()
areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_solvedeps_world.pickle"), "rb"))
- fetchAll()
+
+ for index, binary in enumerate([package + '.tbz2' for package in areBinaries], start=1):
+ print(">>> Downloading binary ({}".format(index) + " " + "of" + " " + str(len(areBinaries)) + ")" + " " + binary)
+ wget.download(binhostURL + binary)
+ print("")
+
+ if os.path.isdir(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0])):
+ shutil.move(binary.rstrip().split("/")[1], os.path.join(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0]), os.path.basename(binary.rstrip().split("/")[1])))
+ else:
+ os.makedirs(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0]))
+ shutil.move(binary.rstrip().split("/")[1], os.path.join(os.path.join(sisyphus.getfs.portageCacheDir, binary.rstrip().split("/")[0]), os.path.basename(binary.rstrip().split("/")[1])))
+
+ if os.path.exists(binary.rstrip().split("/")[1]):
+ os.remove(binary.rstrip().split("/")[1])
diff --git a/src/backend/install.py b/src/backend/install.py
index 1938d6d..3f385f0 100644
--- a/src/backend/install.py
+++ b/src/backend/install.py
@@ -27,7 +27,7 @@ def start(pkgname):
os.chdir(sisyphus.getfs.portageCacheDir)
print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n" + " ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
- sisyphus.download.pkg(pkgname)
+ sisyphus.download.package(pkgname)
portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname))
portageExec.wait()
sisyphus.syncdb.localTable()
@@ -56,7 +56,7 @@ def estart(pkgname):
os.chdir(sisyphus.getfs.portageCacheDir)
print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n" + " ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
- sisyphus.download.pkg(pkgname)
+ sisyphus.download.package(pkgname)
portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--usepkgonly', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname))
portageExec.wait()
sisyphus.syncdb.localTable()
@@ -70,7 +70,7 @@ def estart(pkgname):
print("\n" + "These are the binary packages that would be merged, in order:" + "\n\n" + " ".join(areBinaries) + "\n\n" + "Total:" + " " + str(len(areBinaries)) + " " + "binary package(s)" + "\n")
print("\n" + "These are the source packages that would be merged, in order:" + "\n\n" + " ".join(areSources) + "\n\n" + "Total:" + " " + str(len(areSources)) + " " + "source package(s)" + "\n")
if input("Would you like to proceed?" + " " + "[y/N]" + " ").lower().strip()[:1] == "y":
- sisyphus.download.pkg(pkgname)
+ sisyphus.download.package(pkgname)
portageExec = subprocess.Popen(['emerge', '--quiet', '--verbose', '--usepkg', '--rebuilt-binaries', '--with-bdeps=y', '--misspell-suggestion=n', '--fuzzy-search=n'] + list(pkgname))
portageExec.wait()
sisyphus.syncdb.localTable()
@@ -98,7 +98,7 @@ def startx(pkgname):
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")
- sisyphus.download.pkg(pkgname)
+ sisyphus.download.package(pkgname)
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)
# kill portage if the program dies or it's terminated by the user
atexit.register(sisyphus.killemerge.start, portageExec)