summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-11-04 01:20:13 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-11-04 01:20:13 +0000
commit01cee2ca92981ff1dd6800ea416cf9c02694a3c8 (patch)
tree99842f269610038cead66ddfab2b92cfe6469e00 /src
parentaebc9aec0b456a848c4266c76b5aa8c20b0ccaaf (diff)
maintain some consistency
Diffstat (limited to 'src')
-rw-r--r--src/backend/download.py2
-rw-r--r--src/backend/install.py8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/download.py b/src/backend/download.py
index c48b9d2..f58943c 100644
--- a/src/backend/download.py
+++ b/src/backend/download.py
@@ -7,7 +7,7 @@ import wget
import sisyphus.getenv
import sisyphus.getfs
-def package(pkgname):
+def pkg(pkgname):
binhostURL = sisyphus.getenv.binhostURL()
areBinaries,areSources,needsConfig = pickle.load(open(os.path.join(sisyphus.getfs.portageMetadataDir, "sisyphus_solvedeps_pkg.pickle"), "rb"))
diff --git a/src/backend/install.py b/src/backend/install.py
index 3f385f0..1938d6d 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.package(pkgname)
+ sisyphus.download.pkg(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.package(pkgname)
+ sisyphus.download.pkg(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.package(pkgname)
+ sisyphus.download.pkg(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.package(pkgname)
+ sisyphus.download.pkg(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)