diff --git a/client/text_query.py b/client/text_query.py index 71dcd481b..16d8d41a7 100644 --- a/client/text_query.py +++ b/client/text_query.py @@ -18,6 +18,7 @@ from entropy.output import darkgreen, darkred, red, blue, \ from entropy.exceptions import DependenciesNotRemovable from entropy.misc import Lifo from entropy.i18n import _ +from entropy.cli import show_dependencies_legend, print_package_info import entropy.dep import entropy.tools @@ -335,20 +336,6 @@ def _show_graph_legend(): print_generic("="*40) -def _show_dependencies_legend(indent = '', get_data = False): - data = [] - for dep_id, dep_val in sorted(etpConst['dependency_type_ids'].items(), - key = lambda x: x[0], reverse = True): - - dep_desc = etpConst['dependency_type_ids_desc'].get(dep_id, _("N/A")) - txt = '%s%s%s%s %s' % (indent, teal("{"), dep_val, teal("}"), dep_desc,) - if get_data: - data.append(txt) - else: - print_info(txt) - if get_data: - return data - def _revgraph_package(installed_pkg_id, package, dbconn, show_complete = False, quiet = False): @@ -498,7 +485,7 @@ def _graph_package(match, package, entropy_intf, show_complete = False, item_translation_func, show_already_pulled_in, quiet) if not quiet: _show_graph_legend() - _show_dependencies_legend() + show_dependencies_legend(entropy_intf) del stack graph.destroy() @@ -1544,272 +1531,3 @@ def search_descriptions(descriptions, entropy_client, entropy_repository): return found -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): - - # now fetch essential info - corrupted_str = _("CORRUPTED") - pkgatom = entropy_repository.retrieveAtom(package_id) or corrupted_str - if quiet: - repoinfo = '' - desc = '' - if show_repo_if_quiet: - repoinfo = "[%s] " % (entropy_repository.repository_id(),) - if show_desc_if_quiet: - desc = ' %s' % (entropy_repository.retrieveDescription(package_id),) - if not extended: - pkgatom = entropy.dep.dep_getkey(pkgatom) - print_generic("%s%s%s" % (repoinfo, pkgatom, desc,)) - return - - pkghome = entropy_repository.retrieveHomepage(package_id) - if pkghome is None: - pkghome = corrupted_str - pkgslot = entropy_repository.retrieveSlot(package_id) or corrupted_str - pkgver = entropy_repository.retrieveVersion(package_id) or corrupted_str - pkgtag = entropy_repository.retrieveTag(package_id) - if pkgtag is None: - pkgtag = corrupted_str - pkgrev = entropy_repository.retrieveRevision(package_id) - if pkgrev is None: - pkgrev = 0 - pkgdesc = entropy_repository.retrieveDescription(package_id) - if pkgdesc is None: - pkgdesc = corrupted_str - pkgbranch = entropy_repository.retrieveBranch(package_id) or corrupted_str - if not pkgtag: - pkgtag = "NoTag" - - installed_ver = _("Not installed") - installed_tag = _("N/A") - installed_rev = _("N/A") - if not installed_search: - - # client info - pkginstalled = entropy_client.installed_repository().atomMatch( - entropy.dep.dep_getkey(pkgatom), matchSlot = pkgslot) - if pkginstalled[1] == 0: - idx = pkginstalled[0] - # found - installed_ver = entropy_client.installed_repository( - ).retrieveVersion(idx) or corrupted_str - installed_tag = entropy_client.installed_repository( - ).retrieveTag(idx) - if not installed_tag: - installed_tag = "NoTag" - installed_rev = entropy_client.installed_repository( - ).retrieveRevision(idx) - if installed_rev is None: - installed_rev = const_convert_to_unicode("0") - else: - installed_rev = const_convert_to_unicode(installed_rev) - - toc = [] - - print_info(red(" @@ %s: " % (_("Package"),) ) + bold(pkgatom) + \ - " "+ blue("%s: " % (_("branch"),)) + bold(pkgbranch) + \ - ", [" + purple(str(entropy_repository.repository_id())) + "] ") - if not strict_output and extended: - pkgname = entropy_repository.retrieveName(package_id) or corrupted_str - pkgcat = entropy_repository.retrieveCategory(package_id) or \ - corrupted_str - toc.append((darkgreen(" %s:" % (_("Category"),)), - blue(pkgcat))) - toc.append((darkgreen(" %s:" % (_("Name"),)), - blue(pkgname))) - - if extended: - - pkgmasked = False - masking_reason = '' - # check if it's masked - package_id_masked, idmasking_reason = entropy_repository.maskFilter( - package_id) - if package_id_masked == -1: - pkgmasked = True - masking_reason = ", %s" % ( - entropy_client.Settings()['pkg_masking_reasons'].get( - idmasking_reason),) - - toc.append((darkgreen(" %s:" % (_("Masked"),)), - blue(str(pkgmasked)) + masking_reason,)) - - avail_str = _("Available") - if installed_search: - avail_str = _("Installed") - toc.append(( - darkgreen(" %s:" % (avail_str,)), - blue("%s: " % (_("version"),) ) + bold(pkgver) + blue(" ~ tag: ") + \ - bold(pkgtag) + blue(" ~ %s: " % (_("revision"),) ) + bold(str(pkgrev)),) - ) - - if not installed_search: - toc.append((darkgreen(" %s:" % (_("Installed"),) ), - blue("%s: " % (_("version"),) ) + bold(installed_ver) + \ - blue(" ~ tag: ") + bold(installed_tag) + \ - blue(" ~ %s: " % (_("revision"),) ) + bold(installed_rev),)) - - if not strict_output: - toc.append((darkgreen(" %s:" % (_("Slot"),) ), - blue(str(pkgslot)),)) - - if extended: - pkgsize = entropy_repository.retrieveSize(package_id) - pkgsize = entropy.tools.bytes_into_human(pkgsize) - pkgbin = entropy_repository.retrieveDownloadURL(package_id) - if pkgbin is None: - pkgbin = corrupted_str - pkgdigest = entropy_repository.retrieveDigest(package_id) or \ - corrupted_str - pkgdeps = entropy_repository.retrieveDependencies(package_id, - extended = True, resolve_conditional_deps = False) - pkgconflicts = entropy_repository.retrieveConflicts(package_id) - depsorter = lambda x: entropy.dep.dep_getcpv(x[0]) - - toc.append((darkgreen(" %s:" % (_("Size"),) ), - blue(str(pkgsize)),)) - toc.append((darkgreen(" %s:" % (_("Download"),) ), - brown(str(pkgbin)),)) - toc.append((darkgreen(" %s:" % (_("Checksum"),) ), - brown(str(pkgdigest)),)) - - if pkgdeps: - toc.append(darkred(" ##") + " " + \ - darkgreen("%s:" % (_("Dependencies"),) )) - - for pdep, p_id in sorted(pkgdeps, key = depsorter): - toc.append((" %s " % (brown("##"),), - "%s%s%s %s" % (blue("["), p_id, blue("]"), - brown(pdep),))) - - # show legend - len_txt = " %s" % (brown("##"),) - toc.append((len_txt, "%s:" % (blue(_("Legend")),),)) - dep_leg = _show_dependencies_legend( - indent = "", get_data = True) - toc.extend([(len_txt, x) for x in dep_leg]) - - - if pkgconflicts: - toc.append(darkred(" ##") + " " + \ - darkgreen("%s:" % (_("Conflicts"),) )) - for conflict in sorted(pkgconflicts, key = depsorter): - toc.append((" %s" % (darkred("##"),), - brown(conflict),)) - - home_txt = " %s:" % (_("Homepage"),) - home_lines = _my_formatted_print(pkghome, "", "", color = brown, - min_chars = 15, get_data = True) - for home_line in home_lines: - toc.append((darkgreen(home_txt), home_line,)) - home_txt = " " - - if not strict_output: - - desc_txt = " %s:" % (_("Description"),) - desc_lines = _my_formatted_print(pkgdesc, "", "", get_data = True) - for desc_line in desc_lines: - toc.append((darkgreen(desc_txt), purple(desc_line))) - desc_txt = " " - - if extended: - pkguseflags = entropy_repository.retrieveUseflags(package_id) - use_txt = " %s:" % (_("USE flags"),) - use_lines = _my_formatted_print(pkguseflags, "", "", color = teal, - get_data = True) - for use_line in use_lines: - toc.append((darkgreen(use_txt), use_line)) - use_txt = " " - - if not strict_output: - - if extended: - - chost, cflags, cxxflags = entropy_repository.retrieveCompileFlags( - package_id) - sources = entropy_repository.retrieveSources(package_id) - etpapi = entropy_repository.retrieveApi(package_id) - if etpapi is None: - etpapi = corrupted_str - - toc.append((darkgreen(" %s:" % (_("CHOST"),)), - blue(chost))) - toc.append((darkgreen(" %s:" % (_("CFLAGS"),)), - blue(cflags))) - toc.append((darkgreen(" %s:" % (_("CXXFLAGS"),)), - blue(cxxflags))) - - if sources: - sources_txt = " %s:" % (_("Sources"),) - toc.append(darkgreen(sources_txt)) - for source in sources: - toc.append((" ", source,)) - - toc.append((darkgreen(" %s:" % (_("Entry API"),)), - purple(str(etpapi)))) - toc.append((darkgreen(" %s:" % (_("Compiled with"),)), - blue(cflags))) - - pkgkeywords = ' '.join( - sorted(entropy_repository.retrieveKeywords(package_id))) - keyword_txt = " %s:" % (_("Keywords"),) - keyword_lines = _my_formatted_print(pkgkeywords, "", "", - color = brown, get_data = True) - for keyword_line in keyword_lines: - toc.append((darkgreen(keyword_txt), brown(keyword_line))) - keyword_txt = " " - - mydate = entropy_repository.retrieveCreationDate(package_id) - pkgcreatedate = "N/A" - if mydate: - pkgcreatedate = entropy.tools.convert_unix_time_to_human_time( - float(mydate)) - - toc.append((darkgreen(" %s:" % (_("Created"),)), - purple(pkgcreatedate))) - - pkglic = entropy_repository.retrieveLicense(package_id) - if pkglic is None: - pkglic = corrupted_str - toc.append((darkgreen(" %s:" % (_("License"),)), - teal(pkglic))) - - print_table(toc, cell_spacing = 3) - -def _my_formatted_print(data, header, reset_columns, min_chars = 25, - color = None, get_data = False): - - out_data = [] - - if isinstance(data, (frozenset, set)): - mydata = sorted(data) - elif not isinstance(data, (list, tuple)): - mydata = data.split() - else: - mydata = data - - fcount = 0 - desc_text = header - for item in mydata: - fcount += len(item) - if color: - desc_text += color(item)+" " - else: - desc_text += item+" " - if fcount > min_chars: - fcount = 0 - if get_data: - out_data.append(desc_text) - else: - print_info(desc_text) - desc_text = reset_columns - - if fcount > 0: - if get_data: - out_data.append(desc_text) - else: - print_info(desc_text) - - if get_data: - return out_data diff --git a/lib/entropy/cli.py b/lib/entropy/cli.py index aaa40668e..872b21f08 100644 --- a/lib/entropy/cli.py +++ b/lib/entropy/cli.py @@ -16,9 +16,10 @@ import os import time import subprocess -from entropy.const import etpConst -from entropy.output import print_info, print_generic, writechar, blue, red, \ - brown, darkblue, purple, teal, darkgreen, decolorize +from entropy.const import etpConst, const_convert_to_unicode +from entropy.output import print_info, print_generic, writechar, blue, \ + red, bold, darkred, brown, darkblue, purple, teal, darkgreen, \ + decolorize from entropy.i18n import _ import entropy.dep @@ -390,3 +391,302 @@ def get_entropy_webservice(entropy_client, repository_id, tx_cb = False): if tx_cb: webserv._set_transfer_callback(_transfer_callback) return webserv + +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): + """ + Print Entropy Package Metadata in a pretty and uniform way. + """ + corrupted_str = _("corrupted") + pkgatom = entropy_repository.retrieveAtom(package_id) or corrupted_str + if quiet: + repoinfo = '' + desc = '' + if show_repo_if_quiet: + repoinfo = "[%s] " % (entropy_repository.repository_id(),) + if show_desc_if_quiet: + desc = ' %s' % ( + entropy_repository.retrieveDescription(package_id),) + if not extended: + pkgatom = entropy.dep.dep_getkey(pkgatom) + entropy_client.output( + "%s%s%s" % (repoinfo, pkgatom, desc,), + level="generic") + return + + pkghome = entropy_repository.retrieveHomepage(package_id) + if pkghome is None: + pkghome = corrupted_str + pkgslot = entropy_repository.retrieveSlot(package_id) \ + or corrupted_str + pkgver = entropy_repository.retrieveVersion(package_id) \ + or corrupted_str + pkgtag = entropy_repository.retrieveTag(package_id) + if pkgtag is None: + pkgtag = corrupted_str + pkgrev = entropy_repository.retrieveRevision(package_id) + if pkgrev is None: + pkgrev = 0 + pkgdesc = entropy_repository.retrieveDescription(package_id) + if pkgdesc is None: + pkgdesc = corrupted_str + pkgbranch = entropy_repository.retrieveBranch(package_id) \ + or corrupted_str + if not pkgtag: + pkgtag = "NoTag" + + installed_ver = _("Not installed") + installed_tag = _("N/A") + installed_rev = _("N/A") + if not installed_search: + + # client info + pkginstalled = entropy_client.installed_repository().atomMatch( + entropy.dep.dep_getkey(pkgatom), matchSlot = pkgslot) + if pkginstalled[1] == 0: + idx = pkginstalled[0] + # found + installed_ver = entropy_client.installed_repository( + ).retrieveVersion(idx) or corrupted_str + installed_tag = entropy_client.installed_repository( + ).retrieveTag(idx) + if not installed_tag: + installed_tag = "NoTag" + installed_rev = entropy_client.installed_repository( + ).retrieveRevision(idx) + if installed_rev is None: + installed_rev = const_convert_to_unicode("0") + else: + installed_rev = const_convert_to_unicode(installed_rev) + + toc = [] + + entropy_client.output(red(" @@ %s: " % (_("Package"),) ) + \ + bold(pkgatom) + \ + " "+ blue("%s: " % (_("branch"),)) + bold(pkgbranch) + \ + ", [" + purple(str(entropy_repository.repository_id())) + "] ") + if not strict_output and extended: + pkgname = entropy_repository.retrieveName(package_id) \ + or corrupted_str + pkgcat = entropy_repository.retrieveCategory(package_id) \ + or corrupted_str + toc.append((darkgreen(" %s:" % (_("Category"),)), + blue(pkgcat))) + toc.append((darkgreen(" %s:" % (_("Name"),)), + blue(pkgname))) + + if extended: + + pkgmasked = False + masking_reason = '' + # check if it's masked + package_id_masked, idmasking_reason = \ + entropy_repository.maskFilter(package_id) + if package_id_masked == -1: + pkgmasked = True + masking_reason = ", %s" % ( + entropy_client.Settings()['pkg_masking_reasons'].get( + idmasking_reason),) + + toc.append((darkgreen(" %s:" % (_("Masked"),)), + blue(str(pkgmasked)) + masking_reason,)) + + avail_str = _("Available") + if installed_search: + avail_str = _("Installed") + toc.append(( + darkgreen(" %s:" % (avail_str,)), + blue("%s: " % (_("version"),) ) + bold(pkgver) + blue(" ~ tag: ") + \ + bold(pkgtag) + blue(" ~ %s: " % (_("revision"),) ) + bold(str(pkgrev)),) + ) + + if not installed_search: + toc.append((darkgreen(" %s:" % (_("Installed"),) ), + blue("%s: " % (_("version"),) ) + bold(installed_ver) + \ + blue(" ~ tag: ") + bold(installed_tag) + \ + blue(" ~ %s: " % (_("revision"),) ) + bold(installed_rev),)) + + if not strict_output: + toc.append((darkgreen(" %s:" % (_("Slot"),) ), + blue(str(pkgslot)),)) + + if extended: + pkgsize = entropy_repository.retrieveSize(package_id) + pkgsize = entropy.tools.bytes_into_human(pkgsize) + pkgbin = entropy_repository.retrieveDownloadURL(package_id) + if pkgbin is None: + pkgbin = corrupted_str + pkgdigest = entropy_repository.retrieveDigest(package_id) or \ + corrupted_str + pkgdeps = entropy_repository.retrieveDependencies(package_id, + extended = True, resolve_conditional_deps = False) + pkgconflicts = entropy_repository.retrieveConflicts(package_id) + depsorter = lambda x: entropy.dep.dep_getcpv(x[0]) + + toc.append((darkgreen(" %s:" % (_("Size"),) ), + blue(str(pkgsize)),)) + toc.append((darkgreen(" %s:" % (_("Download"),) ), + brown(str(pkgbin)),)) + toc.append((darkgreen(" %s:" % (_("Checksum"),) ), + brown(str(pkgdigest)),)) + + if pkgdeps: + toc.append(darkred(" ##") + " " + \ + darkgreen("%s:" % (_("Dependencies"),) )) + + for pdep, p_id in sorted(pkgdeps, key = depsorter): + toc.append((" %s " % (brown("##"),), + "%s%s%s %s" % (blue("["), p_id, blue("]"), + brown(pdep),))) + + # show legend + len_txt = " %s" % (brown("##"),) + toc.append((len_txt, "%s:" % (blue(_("Legend")),),)) + dep_leg = show_dependencies_legend(entropy_client, + indent = "", get_data = True) + toc.extend([(len_txt, x) for x in dep_leg]) + + + if pkgconflicts: + toc.append(darkred(" ##") + " " + \ + darkgreen("%s:" % (_("Conflicts"),) )) + for conflict in sorted(pkgconflicts, key = depsorter): + toc.append((" %s" % (darkred("##"),), + brown(conflict),)) + + home_txt = " %s:" % (_("Homepage"),) + home_lines = _my_formatted_print(pkghome, "", "", color = brown, + min_chars = 15, get_data = True) + for home_line in home_lines: + toc.append((darkgreen(home_txt), home_line,)) + home_txt = " " + + if not strict_output: + + desc_txt = " %s:" % (_("Description"),) + desc_lines = _my_formatted_print(pkgdesc, "", "", get_data = True) + for desc_line in desc_lines: + toc.append((darkgreen(desc_txt), purple(desc_line))) + desc_txt = " " + + if extended: + pkguseflags = entropy_repository.retrieveUseflags(package_id) + use_txt = " %s:" % (_("USE flags"),) + use_lines = _my_formatted_print( + pkguseflags, "", "", color = teal, + get_data = True) + for use_line in use_lines: + toc.append((darkgreen(use_txt), use_line)) + use_txt = " " + + if not strict_output: + + if extended: + + chost, cflags, cxxflags = \ + entropy_repository.retrieveCompileFlags(package_id) + sources = entropy_repository.retrieveSources(package_id) + etpapi = entropy_repository.retrieveApi(package_id) + if etpapi is None: + etpapi = corrupted_str + + toc.append((darkgreen(" %s:" % (_("CHOST"),)), + blue(chost))) + toc.append((darkgreen(" %s:" % (_("CFLAGS"),)), + blue(cflags))) + toc.append((darkgreen(" %s:" % (_("CXXFLAGS"),)), + blue(cxxflags))) + + if sources: + sources_txt = " %s:" % (_("Sources"),) + toc.append(darkgreen(sources_txt)) + for source in sources: + toc.append((" ", source,)) + + toc.append((darkgreen(" %s:" % (_("Entry API"),)), + purple(str(etpapi)))) + toc.append((darkgreen(" %s:" % (_("Compiled with"),)), + blue(cflags))) + + pkgkeywords = ' '.join( + sorted(entropy_repository.retrieveKeywords(package_id))) + keyword_txt = " %s:" % (_("Keywords"),) + keyword_lines = _my_formatted_print(pkgkeywords, "", "", + color = brown, get_data = True) + for keyword_line in keyword_lines: + toc.append((darkgreen(keyword_txt), brown(keyword_line))) + keyword_txt = " " + + mydate = entropy_repository.retrieveCreationDate(package_id) + pkgcreatedate = "N/A" + if mydate: + pkgcreatedate = \ + entropy.tools.convert_unix_time_to_human_time( + float(mydate)) + + toc.append((darkgreen(" %s:" % (_("Created"),)), + purple(pkgcreatedate))) + + pkglic = entropy_repository.retrieveLicense(package_id) + if pkglic is None: + pkglic = corrupted_str + toc.append((darkgreen(" %s:" % (_("License"),)), + teal(pkglic))) + + print_table(toc, cell_spacing = 3) + +def _my_formatted_print(data, header, reset_columns, min_chars = 25, + color = None, get_data = False): + + out_data = [] + + if isinstance(data, (frozenset, set)): + mydata = sorted(data) + elif not isinstance(data, (list, tuple)): + mydata = data.split() + else: + mydata = data + + fcount = 0 + desc_text = header + for item in mydata: + fcount += len(item) + if color: + desc_text += color(item)+" " + else: + desc_text += item+" " + if fcount > min_chars: + fcount = 0 + if get_data: + out_data.append(desc_text) + else: + print_info(desc_text) + desc_text = reset_columns + + if fcount > 0: + if get_data: + out_data.append(desc_text) + else: + print_info(desc_text) + + if get_data: + return out_data + +def show_dependencies_legend(entropy_client, indent = '', + get_data = False): + data = [] + dep_type_ids = etpConst['dependency_type_ids'] + for dep_id, dep_val in sorted(dep_type_ids.items(), + key = lambda x: x[0], reverse = True): + + dep_desc = etpConst['dependency_type_ids_desc'].get( + dep_id, _("N/A")) + txt = '%s%s%s%s %s' % ( + indent, teal("{"), dep_val, teal("}"), dep_desc,) + if get_data: + data.append(txt) + else: + entropy_client.output(txt) + if get_data: + return data diff --git a/server/eit/commands/match.py b/server/eit/commands/match.py index 088358c0e..f2e0fd336 100644 --- a/server/eit/commands/match.py +++ b/server/eit/commands/match.py @@ -14,6 +14,7 @@ import argparse from entropy.i18n import _ from entropy.output import purple +from entropy.cli import print_package_info from eit.commands.descriptor import EitCommandDescriptor from eit.commands.command import EitCommand @@ -32,9 +33,6 @@ class EitMatch(EitCommand): EitCommand.__init__(self, args) self._packages = [] self._quiet = False - # text_query import augh - from text_query import print_package_info - self._pprinter = print_package_info def _get_parser(self): descriptor = EitCommandDescriptor.obtain_descriptor( @@ -75,7 +73,7 @@ class EitMatch(EitCommand): continue count += 1 - self._pprinter( + print_package_info( pkg_id, entropy_server, entropy_server.open_repository(pkg_repo), diff --git a/server/eit/commands/own.py b/server/eit/commands/own.py index 4b130ffeb..fb081e8fc 100644 --- a/server/eit/commands/own.py +++ b/server/eit/commands/own.py @@ -15,6 +15,7 @@ import argparse from entropy.i18n import _ from entropy.output import purple, darkgreen, teal, bold +from entropy.cli import print_package_info from eit.commands.descriptor import EitCommandDescriptor from eit.commands.command import EitCommand @@ -35,8 +36,6 @@ class EitOwn(EitCommand): self._quiet = False self._verbose = False self._repository_id = None - from text_query import print_package_info - self._pprint = print_package_info def _get_parser(self): descriptor = EitCommandDescriptor.obtain_descriptor( @@ -130,7 +129,7 @@ class EitOwn(EitCommand): repo.retrieveAtom(pkg_id), level="generic") else: - self._pprint(pkg_id, entropy_server, + print_package_info(pkg_id, entropy_server, repo, installed_search = True, extended = self._verbose, quiet = self._quiet) diff --git a/server/eit/commands/query.py b/server/eit/commands/query.py index 46dedf6ea..bc37c8576 100644 --- a/server/eit/commands/query.py +++ b/server/eit/commands/query.py @@ -14,6 +14,7 @@ import argparse from entropy.output import purple, darkgreen, bold, brown, teal from entropy.const import etpConst +from entropy.cli import print_package_info from entropy.i18n import _ from eit.commands.descriptor import EitCommandDescriptor @@ -35,8 +36,6 @@ class EitQuery(EitCommand): self._quiet = False self._verbose = False self._repository_id = None - from text_query import print_package_info - self._pprint = print_package_info def _get_parser(self): """ Overridden from EitCommand """ @@ -166,7 +165,7 @@ class EitQuery(EitCommand): entropy_server.output(atom, level="generic") else: - self._pprint(pkg_id, entropy_server, + print_package_info(pkg_id, entropy_server, repo, quiet = False) if (not results) and (not self._quiet): diff --git a/server/eit/commands/search.py b/server/eit/commands/search.py index 79ad413d5..de3b5d870 100644 --- a/server/eit/commands/search.py +++ b/server/eit/commands/search.py @@ -14,6 +14,7 @@ import argparse from entropy.i18n import _ from entropy.output import purple +from entropy.cli import print_package_info from eit.commands.descriptor import EitCommandDescriptor from eit.commands.command import EitCommand @@ -32,9 +33,6 @@ class EitSearch(EitCommand): EitCommand.__init__(self, args) self._packages = [] self._quiet = False - # text_query import augh - from text_query import print_package_info - self._pprinter = print_package_info self._repository_id = None def _get_parser(self): @@ -88,7 +86,7 @@ class EitSearch(EitCommand): package, order_by = "atom") for result in results: count += 1 - self._pprinter( + print_package_info( result[1], entropy_server, repo, diff --git a/services/kernel-switcher b/services/kernel-switcher index 58b7811e8..e6379b19a 100755 --- a/services/kernel-switcher +++ b/services/kernel-switcher @@ -16,11 +16,11 @@ from entropy.output import teal, purple, darkgreen, blue, brown, print_info, \ from entropy.exceptions import DependenciesNotRemovable from entropy.i18n import _ from entropy.client.interfaces import Client +from entropy.cli import print_package_info import entropy.dep import entropy.tools # equo modules -from text_query import print_package_info from text_ui import install_packages APP_NAME = os.path.basename(sys.argv[0])