From a9ff28def8cd49deca247ca9efffd1b79fffe849 Mon Sep 17 00:00:00 2001 From: lxnay Date: Thu, 9 Aug 2007 15:31:57 +0000 Subject: [PATCH] add --quiet to all query tools git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@428 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- client/equo | 2 +- client/equoTools.py | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/client/equo b/client/equo index 2dd6ffe94..85dadc183 100644 --- a/client/equo +++ b/client/equo @@ -54,7 +54,7 @@ def print_help(): print_info(" \t\t"+red("--empty")+"\t\t\t also include already installed packages") print_info(" \t\t"+red("--verbose")+"\t\t show more details about what's going on") print_info(" \t"+blue("remove")+brown("\t\t remove a package")) - print_info(" \t"+blue("deptest")+brown("\t look for unsatisfied dependencies")) + print_info(" \t"+blue("deptest")+brown("\t\t look for unsatisfied dependencies")) print_info(" \t\t"+red("--quiet")+"\t\t\t show less details (useful for scripting)") print_info(" \t\t"+red("--ask")+"\t\t\t ask before making any changes") print_info(" \t\t"+red("--pretend")+"\t\t just show what would be done") diff --git a/client/equoTools.py b/client/equoTools.py index fb25f0e5e..76ec11afe 100644 --- a/client/equoTools.py +++ b/client/equoTools.py @@ -1560,7 +1560,7 @@ def query(options): rc = searchInstalledPackages(myopts[1:], quiet = equoRequestQuiet) elif options[0] == "belongs": - rc = searchBelongs(myopts[1:]) + rc = searchBelongs(myopts[1:], quiet = equoRequestQuiet) elif options[0] == "depends": rc = searchDepends(myopts[1:], verbose = equoRequestVerbose, quiet = equoRequestQuiet) @@ -1569,7 +1569,7 @@ def query(options): rc = searchFiles(myopts[1:], quiet = equoRequestQuiet) elif options[0] == "description": - rc = searchDescription(myopts[1:]) + rc = searchDescription(myopts[1:], quiet = equoRequestQuiet) return rc @@ -1895,9 +1895,9 @@ def searchInstalledPackages(packages, idreturn = False, quiet = False): return 0 -def searchBelongs(files, idreturn = False): +def searchBelongs(files, idreturn = False, quiet = False): - if (not idreturn): + if (not idreturn) and (not quiet): print_info(yellow(" @@ ")+darkgreen("Belong Search...")) clientDbconn = openClientDatabase() @@ -1907,12 +1907,14 @@ def searchBelongs(files, idreturn = False): result = clientDbconn.searchBelongs(file) if (result): # print info - if (not idreturn): + if (not idreturn) and (not quiet): print_info(blue(" Keyword: ")+bold("\t"+file)) print_info(blue(" Found: ")+bold("\t"+str(len(result)))+red(" entries")) for idpackage in result: if (idreturn): dataInfo.append(idpackage) + elif (quiet): + print clientDbconn.retrieveAtom(idpackage) else: printPackageInfo(idpackage, clientDbconn, clientSearch = True) @@ -1989,11 +1991,11 @@ def searchFiles(atoms, idreturn = False, quiet = False): return 0 -def searchDescription(descriptions, idreturn = False): +def searchDescription(descriptions, idreturn = False, quiet = False): foundPackages = {} - if (not idreturn): + if (not idreturn) and (not quiet): print_info(yellow(" @@ ")+darkgreen("Description Search...")) # search inside each available database repoNumber = 0 @@ -2002,7 +2004,7 @@ def searchDescription(descriptions, idreturn = False): foundPackages[repo] = {} repoNumber += 1 - if (not idreturn): + if (not idreturn) and (not quiet): print_info(blue(" #"+str(repoNumber))+bold(" "+etpRepositories[repo]['description'])) rc = fetchRepositoryIfNotAvailable(repo) @@ -2017,7 +2019,7 @@ def searchDescription(descriptions, idreturn = False): if (result): foundPackages[repo][desc] = result # print info - if (not idreturn): + if (not idreturn) and (not quiet): print_info(blue(" Keyword: ")+bold("\t"+desc)) print_info(blue(" Found: ")+bold("\t"+str(len(foundPackages[repo][desc])))+red(" entries")) for pkg in foundPackages[repo][desc]: @@ -2025,6 +2027,8 @@ def searchDescription(descriptions, idreturn = False): atom = pkg[0] if (idreturn): dataInfo.append([idpackage,repo]) + elif (quiet): + print dbconn.retrieveAtom(idpackage) else: printPackageInfo(idpackage,dbconn)