summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-10-30 14:41:24 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-10-30 14:41:24 +0000
commitd5fcb065ad5442e20517ff35508c6b4b8ca59ef1 (patch)
tree4f588edb573e2bd0fc0988cb7ef583d4d178b26a
parent93e836bbb49430929f7d827a9eb62246dd809f4c (diff)
move resolveDeps -> solvedeps
-rw-r--r--src/backend/__init__.py2
-rw-r--r--src/backend/installPkg.py6
-rw-r--r--src/backend/installSrc.py4
-rw-r--r--src/backend/solvedeps.py (renamed from src/backend/resolveDeps.py)0
-rw-r--r--src/backend/upgradePkg.py6
-rw-r--r--src/backend/upgradeSrc.py4
6 files changed, 11 insertions, 11 deletions
diff --git a/src/backend/__init__.py b/src/backend/__init__.py
index 7467185..238a194 100644
--- a/src/backend/__init__.py
+++ b/src/backend/__init__.py
@@ -7,7 +7,7 @@ from .installSrc import *
from .killemerge import *
from .purgeenv import *
from .recoverdb import *
-from .resolveDeps import *
+from .solvedeps import *
from .searchPkg import *
from .searchSrc import *
from .setBranch import *
diff --git a/src/backend/installPkg.py b/src/backend/installPkg.py
index 55af933..1e2f51e 100644
--- a/src/backend/installPkg.py
+++ b/src/backend/installPkg.py
@@ -11,7 +11,7 @@ import sisyphus.checkenv
import sisyphus.getenv
import sisyphus.getfs
import sisyphus.killemerge
-import sisyphus.resolveDeps
+import sisyphus.solvedeps
import sisyphus.syncDatabase
import sisyphus.updateAll
@@ -20,7 +20,7 @@ def cliExec(pkgname):
sisyphus.updateAll.cliExec()
binhostURL = sisyphus.getenv.binhostURL()
- areBinaries,areSources,needsConfig = sisyphus.resolveDeps.package(pkgname)
+ areBinaries,areSources,needsConfig = sisyphus.solvedeps.package(pkgname)
if needsConfig == 0:
if len(areSources) == 0:
@@ -60,7 +60,7 @@ def cliExec(pkgname):
def guiExec(pkgname):
binhostURL = sisyphus.getenv.binhostURL()
- areBinaries,areSources,needsConfig = sisyphus.resolveDeps.package.__wrapped__(pkgname) #undecorate
+ areBinaries,areSources,needsConfig = sisyphus.solvedeps.package.__wrapped__(pkgname) #undecorate
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/installSrc.py b/src/backend/installSrc.py
index 6abc7b2..d860c20 100644
--- a/src/backend/installSrc.py
+++ b/src/backend/installSrc.py
@@ -9,7 +9,7 @@ import wget
import sisyphus.checkenv
import sisyphus.getenv
import sisyphus.getfs
-import sisyphus.resolveDeps
+import sisyphus.solvedeps
import sisyphus.syncDatabase
import sisyphus.updateAll
@@ -18,7 +18,7 @@ def cliExec(pkgname):
sisyphus.updateAll.cliExec()
binhostURL = sisyphus.getenv.binhostURL()
- areBinaries,areSources,needsConfig = sisyphus.resolveDeps.package(pkgname)
+ areBinaries,areSources,needsConfig = sisyphus.solvedeps.package(pkgname)
if needsConfig == 0:
if len(areSources) == 0:
diff --git a/src/backend/resolveDeps.py b/src/backend/solvedeps.py
index 41e9103..41e9103 100644
--- a/src/backend/resolveDeps.py
+++ b/src/backend/solvedeps.py
diff --git a/src/backend/upgradePkg.py b/src/backend/upgradePkg.py
index 63a6973..566ff85 100644
--- a/src/backend/upgradePkg.py
+++ b/src/backend/upgradePkg.py
@@ -11,7 +11,7 @@ import sisyphus.checkenv
import sisyphus.getenv
import sisyphus.getfs
import sisyphus.killemerge
-import sisyphus.resolveDeps
+import sisyphus.solvedeps
import sisyphus.syncDatabase
import sisyphus.updateAll
@@ -20,7 +20,7 @@ def cliExec():
sisyphus.updateAll.cliExec()
binhostURL = sisyphus.getenv.binhostURL()
- areBinaries,areSources,needsConfig = sisyphus.resolveDeps.world()
+ areBinaries,areSources,needsConfig = sisyphus.solvedeps.world()
if needsConfig == 0:
if len(areSources) == 0:
@@ -60,7 +60,7 @@ def cliExec():
def guiExec():
binhostURL = sisyphus.getenv.binhostURL()
- areBinaries,areSources,needsConfig = sisyphus.resolveDeps.world.__wrapped__() #undecorate
+ areBinaries,areSources,needsConfig = sisyphus.solvedeps.world.__wrapped__() #undecorate
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")
diff --git a/src/backend/upgradeSrc.py b/src/backend/upgradeSrc.py
index 4f06cd2..2d88dac 100644
--- a/src/backend/upgradeSrc.py
+++ b/src/backend/upgradeSrc.py
@@ -9,7 +9,7 @@ import wget
import sisyphus.checkenv
import sisyphus.getenv
import sisyphus.getfs
-import sisyphus.resolveDeps
+import sisyphus.solvedeps
import sisyphus.syncDatabase
import sisyphus.updateAll
@@ -18,7 +18,7 @@ def cliExec():
sisyphus.updateAll.cliExec()
binhostURL = sisyphus.getenv.binhostURL()
- areBinaries,areSources,needsConfig = sisyphus.resolveDeps.world()
+ areBinaries,areSources,needsConfig = sisyphus.solvedeps.world()
if needsConfig == 0:
if len(areSources) == 0: