From 6cb4daa56408c342d85df8e567581972fe7ba4c1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 9 Nov 2018 21:10:25 +0000 Subject: refuse to install/uninstall/force-uninstall/search if no package name is given --- src/backend/libsisyphus.py | 2 +- src/frontend/cli/sisyphus-cli.py | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/backend/libsisyphus.py b/src/backend/libsisyphus.py index 5f18bae..ae6bd93 100644 --- a/src/backend/libsisyphus.py +++ b/src/backend/libsisyphus.py @@ -235,7 +235,7 @@ def startInstall(pkgList): portageExec.wait() syncLocalDatabase() else: - sys.exit("\n" + "Nothing to install; quitting." + "\n") + sys.exit("\n" + "No such binary; quitting." + "\n") def startUpgrade(): syncAll() diff --git a/src/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py index e7637cb..ff68593 100755 --- a/src/frontend/cli/sisyphus-cli.py +++ b/src/frontend/cli/sisyphus-cli.py @@ -8,11 +8,20 @@ pkgList = sys.argv[2:] if "__main__" == __name__: if sys.argv[1:]: if "install" in sys.argv[1:]: - startInstall(pkgList) + if not pkgList: + sys.exit("\n" + "Nothing to install, please give at least one package name; quitting" + "\n") + else: + startInstall(pkgList) elif "uninstall" in sys.argv[1:]: - startUninstall(pkgList) + if not pkgList: + sys.exit("\n" + "Nothing to uninstall, please give at least one package name; quitting" + "\n") + else: + startUninstall(pkgList) elif "force-uninstall" in sys.argv[1:]: - startUninstallForce(pkgList) + if not pkgList: + sys.exit("\n" + "Nothing to force uninstall, please give at least one package name; quitting" + "\n") + else: + startUninstallForce(pkgList) elif "remove-orphans" in sys.argv[1:]: removeOrphans() elif "update" in sys.argv[1:]: @@ -20,7 +29,10 @@ if "__main__" == __name__: elif "upgrade" in sys.argv[1:]: startUpgrade() elif "search" in sys.argv[1:]: - startSearch(pkgList) + if not pkgList: + sys.exit("\n" + "Nothing to search, please give at least one package name; quitting" + "\n") + else: + startSearch(pkgList) elif "spmsync" in sys.argv[1:]: startSyncSPM() elif "rescue" in sys.argv[1:]: -- cgit v1.2.3