summaryrefslogtreecommitdiff
path: root/src/frontend
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-02-02 01:07:55 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-02-02 01:07:55 +0000
commited3747e4ff721914d1df6b62788a91a1e8b3f741 (patch)
tree25f2987643c99657eb8f7945d1f68c19c9cfa2bf /src/frontend
parentfb13a317b1468c6070f4c6131a6526ffbf284511 (diff)
* better explain some used terms
* update the help menu and CLI documentation * remove animations from setjobs module (it takes less than a second, so it's pointless) * make some error messages less cryptic && offer help to understand them * don't kill the graphical interface right away if there is a missmatch, display the error, offer help && and then die in 10 seconds
Diffstat (limited to 'src/frontend')
-rw-r--r--src/frontend/cli/README.md10
-rwxr-xr-xsrc/frontend/cli/sisyphus-cli.py10
-rw-r--r--src/frontend/gui/sisyphus-gui.py4
3 files changed, 12 insertions, 12 deletions
diff --git a/src/frontend/cli/README.md b/src/frontend/cli/README.md
index 5636e2e..567db9d 100644
--- a/src/frontend/cli/README.md
+++ b/src/frontend/cli/README.md
@@ -23,7 +23,7 @@ $ sisyphus [OPTIONS] COMMAND [ARGS]...
* `autoremove`: Uninstall packages that are no longer needed.
* `branch`: Pull the selected branch of the Portage tree,...
* `install`: Install binary and/or ebuild(source)...
-* `mirror`: List/Set the active binary repository mirror.
+* `mirror`: List/Set the active binhost (binary repository) mirror.
* `rescue`: Resurrect Sisyphus's package database if lost...
* `search`: Search for binary and/or ebuild (source)...
* `spmsync`: Sync Sisyphus's package database with...
@@ -70,9 +70,9 @@ The remote can be selected by using the --remote option.
!!! WARNING !!!
-Once you changed the branch, you must pair it with the correct binary repository.
+Once you changed the branch, you must pair it with the correct binhost (binary repository).
-Branch 'master' must be paired with the stable binary repository (odd numbers in 'sisyphus mirror list').
+Branch 'master' must be paired with the stable binhost (binary repository) (odd numbers in 'sisyphus mirror list').
* Examples:
@@ -82,7 +82,7 @@ Branch 'master' must be paired with the stable binary repository (odd numbers in
` sisyphus mirror set 5
`
-Branch 'next' must be paired with the testing binary repository (even numbers in 'sisyphus mirror list').
+Branch 'next' must be paired with the testing binhost (binary repository) (even numbers in 'sisyphus mirror list').
* Examples:
@@ -136,7 +136,7 @@ $ sisyphus install [OPTIONS] PKGNAME...
## `sisyphus mirror`
-List/Set the active binary repository mirror.
+List/Set the active binhost (binary repository) mirror.
**Usage**:
diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py
index 5c87698..eb385d1 100755
--- a/src/frontend/cli/sisyphus-cli.py
+++ b/src/frontend/cli/sisyphus-cli.py
@@ -8,7 +8,7 @@ import sys
app = typer.Typer()
mirrorSetup = typer.Typer()
-app.add_typer(mirrorSetup, name="mirror", help='List/Set the active binary repository mirror.')
+app.add_typer(mirrorSetup, name="mirror", help='List/Set the active binhost (binary repository) mirror.')
@app.callback()
def app_callback(ctx: typer.Context):
@@ -249,9 +249,9 @@ def branch(branch: Branch = typer.Argument(...), remote: Remote = typer.Option(R
!!! WARNING !!!
- Once you changed the branch, you must pair it with the correct binary repository.
+ Once you changed the branch, you must pair it with the correct binhost (binary repository).
- Branch 'master' must be paired with the stable binary repository (odd numbers in 'sisyphus mirror list').
+ Branch 'master' must be paired with the stable binhost (binary repository) (odd numbers in 'sisyphus mirror list').
* Examples:
@@ -259,7 +259,7 @@ def branch(branch: Branch = typer.Argument(...), remote: Remote = typer.Option(R
sisyphus mirror set 5
- Branch 'next' must be paired with the testing binary repository (even numbers in 'sisyphus mirror list').
+ Branch 'next' must be paired with the testing binhost (binary repository) (even numbers in 'sisyphus mirror list').
* Examples:
@@ -287,5 +287,5 @@ def mirrorset(index: int):
if __name__ == "__main__":
if len(sys.argv) > 1 and not '--help' in sys.argv:
sisyphus.check.update()
- sisyphus.setjobs.start.__wrapped__() # undecorate
+ sisyphus.setjobs.start()
app()
diff --git a/src/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py
index 8930f6c..67d3f1f 100644
--- a/src/frontend/gui/sisyphus-gui.py
+++ b/src/frontend/gui/sisyphus-gui.py
@@ -384,8 +384,8 @@ class MainWorker(QtCore.QObject):
def startUpdate(self):
self.started.emit()
sisyphus.check.update()
- sisyphus.setjobs.start.__wrapped__() # undecorate
- sisyphus.update.start.__wrapped__() # undecorate
+ sisyphus.setjobs.start()
+ sisyphus.update.startqt()
self.finished.emit()
@QtCore.pyqtSlot()