summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/backend/__init__.py4
-rw-r--r--src/backend/installbinary.py (renamed from src/backend/install.py)2
-rw-r--r--src/backend/upgradebinary.py (renamed from src/backend/upgrade.py)2
-rwxr-xr-xsrc/frontend/cli/sisyphus-cli.py4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/__init__.py b/src/backend/__init__.py
index ee584e8..37d8db6 100644
--- a/src/backend/__init__.py
+++ b/src/backend/__init__.py
@@ -7,7 +7,7 @@ from .check import *
from .csvfiles import *
from .database import *
from .filesystem import *
-from .install import *
+from .installbinary import *
from .installebuild import *
from .killportage import *
from .metadata import *
@@ -23,5 +23,5 @@ from .sysinfo import *
from .uninstallforce import *
from .uninstall import *
from .update import *
-from .upgrade import *
+from .upgradebinary import *
from .upgradeebuild import *
diff --git a/src/backend/install.py b/src/backend/installbinary.py
index ab1c051..7df5a88 100644
--- a/src/backend/install.py
+++ b/src/backend/installbinary.py
@@ -58,4 +58,4 @@ def start(pkgname):
else:
sys.exit("\n" + "No package found; Quitting." + "\n")
else:
- sys.exit("\n" + "Source package(s) found in the mix;" + " " + "Use" + " " + "'" + "sisyphus install" + " " + ''.join(pkgname) + " " + "--hybrid" + "'" + ";" + " " + "Quitting." + "\n")
+ sys.exit("\n" + "Source package(s) found in the mix;" + " " + "Use" + " " + "'" + "sisyphus install" + " " + ''.join(pkgname) + " " + "--ebuild" + "'" + ";" + " " + "Quitting." + "\n")
diff --git a/src/backend/upgrade.py b/src/backend/upgradebinary.py
index 19bbd17..a806214 100644
--- a/src/backend/upgrade.py
+++ b/src/backend/upgradebinary.py
@@ -58,4 +58,4 @@ def start():
else:
sys.exit("\n" + "No package upgrades found; Quitting." + "\n")
else:
- sys.exit("\n" + "Source package(s) found in the mix;" + " " + "Use" + " " + "'" + "sisyphus upgrade --hybrid" + "'" + ";" + " " + "Quitting." + "\n")
+ sys.exit("\n" + "Source package(s) found in the mix;" + " " + "Use" + " " + "'" + "sisyphus upgrade --ebuild" + "'" + ";" + " " + "Quitting." + "\n")
diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py
index 65000c0..0be7b45 100755
--- a/src/frontend/cli/sisyphus-cli.py
+++ b/src/frontend/cli/sisyphus-cli.py
@@ -45,7 +45,7 @@ def install(pkgname: List[str], ebuild: bool = typer.Option(False, "--ebuild", "
You can use the --ebuild option even if you don't want to install any ebuild(source) packages; It will fall back to binary packages only.
"""
if not ebuild:
- sisyphus.install.start(pkgname)
+ sisyphus.installbinary.start(pkgname)
else:
sisyphus.installebuild.start(pkgname)
@@ -121,7 +121,7 @@ def upgrade(ebuild: bool = typer.Option(False, "--ebuild", "-e")):
You can use the --ebuild option even if you don't have any ebuild(source) packages installed; It will fall back to binary packages only.
"""
if not ebuild:
- sisyphus.upgrade.start()
+ sisyphus.upgradebinary.start()
else:
sisyphus.upgradeebuild.start()