From 1c37d0c8dc00d9d34b7f137b4651d08a7f6547fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 8 Jul 2019 23:55:09 +0100 Subject: libsisyphus : take stratact's suggestion, redocument the new options --- src/backend/libsisyphus.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py index c1a99fd..66f9fa1 100644 --- a/src/backend/libsisyphus.py +++ b/src/backend/libsisyphus.py @@ -730,16 +730,21 @@ def showHelp(): print("* If Portage's package database is intact, full resurrection will be possible" + "\n") print("--mirror --list") print("* List available binary package repository mirrors (the active one is marked with *)" + "\n") - print("--mirror --set INDEX") + print("--mirror --set 'INDEX'") print("* Change the binary package repository to the selected mirror" + "\n") - print("--branch=master --remote=gitlab") - print("* Pull the master (stable) branch of the Portage tree, Redcore overlay && Portage configs. Use gitlab.com git repositories." + "\n") - print("--branch=master --remote=pagure") - print("* Pull the master (stable) branch of the Portage tree, Redcore overlay && Portage configs. Use pagure.io git repositories." + "\n") - print("--branch=next --remote=gitlab") - print("* Pull the next (testing) branch of the Portage tree, Redcore overlay && Portage configs. Use gitlab.com git repositories." + "\n") - print("--branch=next --remote=pagure") - print("* Pull the next (testing) branch of the Portage tree, Redcore overlay && Portage configs. Use pagure.io git repositories." + "\n") + print("--branch='BRANCH' --remote='REMOTE'") + print("* Pull the branch 'BRANCH' of the Portage tree, Redcore overlay && Portage configs. Use 'REMOTE' git repositories.") + print("* 'BRANCH' can be one of the following : master, next") + print("* 'REMOTE' can be one of the following : gitlab, pagure") + print("*") + print("* Examples: ") + print("* '--branch=master --remote=gitlab' will pull the branch 'master' from gitlab.com") + print("* '--branch=next --remote=pagure' will pull the branch 'next' from pagure.io") + print("*") + print("* !!! WARNING !!!") + print("* Once you changed the branch, you must pair the branch 'BRANCH' with the correct binary repository") + print("* Branch 'master' must be paired with the stable binary repository (odd numbers in 'sisyphus --mirror --list'). Examples : 'sisyphus --mirror --set 1' or 'sisyphus --mirror --set 5' ") + print("* Branch 'next' must be paired with the testing binary repository (even numbers in 'sisyphus --mirror --list'). Examples : 'sisyphus --mirror --set 2' or 'sisyphus --mirror --set 8'" + "\n") print("--sysinfo") print("* Display information about installed core packages and portage configuration" + "\n") print("--help") -- cgit v1.2.3