[Solo] add "--showslot" (show package slot) support to "equo match"

This commit is contained in:
Fabio Erculiani
2012-11-03 12:15:19 +01:00
parent 631b7df3b9
commit 66f5e4024f
2 changed files with 13 additions and 2 deletions

View File

@@ -45,6 +45,7 @@ Match package names.
self._multirepo = False
self._showrepo = False
self._showdesc = False
self._showslot = False
self._packages = []
def man(self):
@@ -61,7 +62,7 @@ Match package names.
"--quiet", "--verbose",
"--installed", "--available",
"--multimatch", "--multirepo",
"--showrepo"]
"--showrepo", "--showslot"]
args.sort()
return self._bashcomp(sys.stdout, last_arg, args)
@@ -114,6 +115,10 @@ Match package names.
"--showdesc", action="store_true",
default=self._showdesc,
help=_('print description too (w/--quiet)'))
parser.add_argument(
"--showslot", action="store_true",
default=self._showslot,
help=_('print ":<slot>" next to package names (w/--quiet)'))
return parser
@@ -137,6 +142,7 @@ Match package names.
self._multirepo = nsargs.multirepo
self._showrepo = nsargs.showrepo
self._showdesc = nsargs.showdesc
self._showslot = nsargs.showslot
return self._call_unlocked, [self.match]
@@ -221,6 +227,7 @@ Match package names.
pkg_id, entropy_client, dbconn,
show_repo_if_quiet = self._showrepo,
show_desc_if_quiet = self._showdesc,
show_slot_if_quiet = self._showslot,
extended = self._verbose,
installed_search = from_client,
quiet = self._quiet)

View File

@@ -269,7 +269,8 @@ def get_entropy_webservice(entropy_client, repository_id, tx_cb = False):
def print_package_info(package_id, entropy_client, entropy_repository,
installed_search = False, strict_output = False, extended = False,
quiet = False, show_repo_if_quiet = False, show_desc_if_quiet = False):
quiet = False, show_repo_if_quiet = False, show_desc_if_quiet = False,
show_slot_if_quiet = False):
"""
Print Entropy Package Metadata in a pretty and uniform way.
"""
@@ -285,6 +286,9 @@ def print_package_info(package_id, entropy_client, entropy_repository,
entropy_repository.retrieveDescription(package_id),)
if not extended:
pkgatom = entropy.dep.dep_getkey(pkgatom)
if show_slot_if_quiet:
pkgatom += etpConst['entropyslotprefix']
pkgatom += entropy_repository.retrieveSlot(package_id)
entropy_client.output(
"%s%s%s" % (repoinfo, pkgatom, desc,),
level="generic")