diff --git a/client/solo/commands/match.py b/client/solo/commands/match.py index 536f83b4f..8320948fd 100644 --- a/client/solo/commands/match.py +++ b/client/solo/commands/match.py @@ -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 ":" 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) diff --git a/client/solo/utils.py b/client/solo/utils.py index c84488138..bfe0468d0 100644 --- a/client/solo/utils.py +++ b/client/solo/utils.py @@ -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")