From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RoO8E-00011B-C7 for garchives@archives.gentoo.org; Fri, 20 Jan 2012 23:44:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42024E09A9; Fri, 20 Jan 2012 23:44:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F158FE09A9 for ; Fri, 20 Jan 2012 23:44:22 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 69F951B400A for ; Fri, 20 Jan 2012 23:44:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8825E80042 for ; Fri, 20 Jan 2012 23:44:21 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: <95d6ed5e34d59b5ba42d36cfc3554296007d060b.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/main.py pym/_emerge/resolver/output.py pym/_emerge/resolver/output_helpers.py X-VCS-Directories: pym/_emerge/resolver/ pym/_emerge/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 95d6ed5e34d59b5ba42d36cfc3554296007d060b Date: Fri, 20 Jan 2012 23:44:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: fea7d022-e10e-4d74-beaf-188d6afd6256 X-Archives-Hash: 9d8b4d16fc678a4b22af2105bd35d506 commit: 95d6ed5e34d59b5ba42d36cfc3554296007d060b Author: Arfrever Frehtes Taifersar Arahesis Gentoo Org> AuthorDate: Fri Jan 20 23:40:52 2012 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gentoo org> CommitDate: Fri Jan 20 23:40:52 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D95d6ed5e Print ::${repository} in output of `emerge -pv ${package}` by default. Add --quiet-repo-display option, which enables previous, more quiet outpu= t. --- pym/_emerge/main.py | 1 + pym/_emerge/resolver/output.py | 60 +++++++++++++++++++++++---= ------ pym/_emerge/resolver/output_helpers.py | 3 +- 3 files changed, 46 insertions(+), 18 deletions(-) diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index d02f2a6..65df99d 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -66,6 +66,7 @@ options=3D[ "--nodeps", "--noreplace", "--nospinner", "--oneshot", "--onlydeps", "--pretend", +"--quiet-repo-display", "--quiet-unmerge-warn", "--resume", "--searchdesc", diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output= .py index bed5e44..15f9225 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -13,7 +13,7 @@ import sys from portage import os from portage import _unicode_decode from portage.dbapi.dep_expand import dep_expand -from portage.dep import cpvequal +from portage.dep import cpvequal, _repo_separator from portage.exception import InvalidDependString, SignatureException from portage.output import ( blue, bold, colorize, create_color_func, darkblue, darkgreen, green, nc_len, red, teal, turquoise, yellow ) @@ -339,6 +339,9 @@ class Display(object): self.counters.totalsize +=3D mysize self.verboseadd +=3D _format_size(mysize) =20 + if not self.quiet_repo_display: + return + # overlay verbose # assign index for a previous version in the same slot slot_matches =3D self.vardb.match(pkg.slot_atom) @@ -368,8 +371,7 @@ class Display(object): repoadd_set.add(self.repoadd) =20 =20 - @staticmethod - def convert_myoldbest(myoldbest): + def convert_myoldbest(self, myoldbest): """converts and colorizes a version list to a string =20 @param myoldbest: list @@ -384,6 +386,8 @@ class Display(object): "-" + catpkgsplit(pkg.cpv)[3] if key[-3:] =3D=3D "-r0": key =3D key[:-3] + if self.conf.verbosity =3D=3D 3 and not self.quiet_repo_display: + key +=3D _repo_separator + pkg.repo versions.append(key) myoldbest_str =3D blue("["+", ".join(versions)+"]") return myoldbest_str @@ -412,10 +416,13 @@ class Display(object): @param pkg: _emerge.Package instance @rtype string """ + ver_str =3D pkg_info.ver + if self.conf.verbosity =3D=3D 3 and not self.quiet_repo_display: + ver_str +=3D _repo_separator + pkg.repo if self.conf.quiet: myprint =3D addl + " " + self.indent + \ self.pkgprint(pkg_info.cp, pkg_info) - myprint =3D myprint+darkblue(" "+pkg_info.ver)+" " + myprint =3D myprint+darkblue(" "+ver_str)+" " myprint =3D myprint+pkg_info.oldbest myprint =3D myprint+darkgreen("to "+pkg.root) self.verboseadd =3D None @@ -430,7 +437,7 @@ class Display(object): self.indent, self.pkgprint(pkg.cp, pkg_info)) if (self.newlp-nc_len(myprint)) > 0: myprint =3D myprint+(" "*(self.newlp-nc_len(myprint))) - myprint =3D myprint+"["+darkblue(pkg_info.ver)+"] " + myprint =3D myprint+"["+darkblue(ver_str)+"] " if (self.oldlp-nc_len(myprint)) > 0: myprint =3D myprint+" "*(self.oldlp-nc_len(myprint)) myprint =3D myprint+pkg_info.oldbest @@ -447,10 +454,13 @@ class Display(object): @rtype string Modifies self.verboseadd """ + ver_str =3D pkg_info.ver + if self.conf.verbosity =3D=3D 3 and not self.quiet_repo_display: + ver_str +=3D _repo_separator + pkg.repo if self.conf.quiet: myprint =3D addl + " " + self.indent + \ self.pkgprint(pkg_info.cp, pkg_info) - myprint =3D myprint+" "+green(pkg_info.ver)+" " + myprint =3D myprint+" "+green(ver_str)+" " myprint =3D myprint+pkg_info.oldbest self.verboseadd =3D None else: @@ -465,7 +475,7 @@ class Display(object): self.indent, self.pkgprint(pkg.cp, pkg_info)) if (self.newlp-nc_len(myprint)) > 0: myprint =3D myprint+(" "*(self.newlp-nc_len(myprint))) - myprint =3D myprint+green(" ["+pkg_info.ver+"] ") + myprint =3D myprint+green(" ["+ver_str+"] ") if (self.oldlp-nc_len(myprint)) > 0: myprint =3D myprint+(" "*(self.oldlp-nc_len(myprint))) myprint +=3D pkg_info.oldbest @@ -480,18 +490,21 @@ class Display(object): @param addl: the current text to add for the next line to output @rtype the updated addl """ + pkg_str =3D pkg.cpv + if self.conf.verbosity =3D=3D 3 and not self.quiet_repo_display: + pkg_str +=3D _repo_separator + pkg.repo if not pkg_info.merge: addl =3D self.empty_space_in_brackets() myprint =3D "[%s%s] %s%s %s" % \ (self.pkgprint(pkg_info.operation.ljust(13), pkg_info), addl, - self.indent, self.pkgprint(pkg.cpv, pkg_info), + self.indent, self.pkgprint(pkg_str, pkg_info), pkg_info.oldbest) else: myprint =3D "[%s %s] %s%s %s" % \ (self.pkgprint(pkg.type_name, pkg_info), addl, self.indent, - self.pkgprint(pkg.cpv, pkg_info), pkg_info.oldbest) + self.pkgprint(pkg_str, pkg_info), pkg_info.oldbest) return myprint =20 =20 @@ -795,9 +808,12 @@ class Display(object): # files to fetch list - avoids counting a same file twice # in size display (verbose mode) self.myfetchlist =3D set() - # Use this set to detect when all the "repoadd" strings are "[0]" - # and disable the entire repo display in this case. - repoadd_set =3D set() + =09 + self.quiet_repo_display =3D "--quiet-repo-display" in depgraph._frozen= _config.myopts + if self.quiet_repo_display: + # Use this set to detect when all the "repoadd" strings are "[0]" + # and disable the entire repo display in this case. + repoadd_set =3D set() =20 for mylist_index in range(len(mylist)): pkg, depth, ordered =3D mylist[mylist_index] @@ -814,11 +830,15 @@ class Display(object): addl, pkg_info.oldbest, myinslotlist =3D \ self._get_installed_best(pkg, pkg_info) self.verboseadd =3D "" - self.repoadd =3D None + if self.quiet_repo_display: + self.repoadd =3D None self._display_use(pkg, pkg_info.oldbest, myinslotlist) self.recheck_hidden(pkg) if self.conf.verbosity =3D=3D 3: - self.verbose_size(pkg, repoadd_set, pkg_info) + if self.quiet_repo_display: + self.verbose_size(pkg, repoadd_set, pkg_info) + else: + self.verbose_size(pkg, None, pkg_info) =20 pkg_info.cp =3D pkg.cp pkg_info.ver =3D self.get_ver_str(pkg) @@ -840,6 +860,9 @@ class Display(object): myprint =3D self._set_non_root_columns( addl, pkg_info, pkg) else: + pkg_str =3D pkg.cpv + if self.conf.verbosity =3D=3D 3 and not self.quiet_repo_display: + pkg_str +=3D _repo_separator + pkg.repo if not pkg_info.merge: addl =3D self.empty_space_in_brackets() myprint =3D "[%s%s] " % ( @@ -850,7 +873,7 @@ class Display(object): myprint =3D "[%s %s] " % ( self.pkgprint(pkg.type_name, pkg_info), addl) myprint +=3D self.indent + \ - self.pkgprint(pkg.cpv, pkg_info) + " " + \ + self.pkgprint(pkg_str, pkg_info) + " " + \ pkg_info.oldbest + darkgreen("to " + pkg.root) else: if self.conf.columns: @@ -862,9 +885,12 @@ class Display(object): =20 if self.conf.columns and pkg.operation =3D=3D "uninstall": continue - self.print_msg.append((myprint, self.verboseadd, self.repoadd)) + if self.quiet_repo_display: + self.print_msg.append((myprint, self.verboseadd, self.repoadd)) + else: + self.print_msg.append((myprint, self.verboseadd, None)) =20 - show_repos =3D repoadd_set and repoadd_set !=3D set(["0"]) + show_repos =3D self.quiet_repo_display and repoadd_set and repoadd_set= !=3D set(["0"]) =20 # now finally print out the messages self.print_messages(show_repos) diff --git a/pym/_emerge/resolver/output_helpers.py b/pym/_emerge/resolve= r/output_helpers.py index 4587661..5e5e106 100644 --- a/pym/_emerge/resolver/output_helpers.py +++ b/pym/_emerge/resolver/output_helpers.py @@ -211,7 +211,8 @@ class _DisplayConfig(object): del e self.columnwidth =3D mywidth =20 - self.repo_display =3D _RepoDisplay(frozen_config.roots) + if "--quiet-repo-display" in frozen_config.myopts: + self.repo_display =3D _RepoDisplay(frozen_config.roots) self.trees =3D frozen_config.trees self.pkgsettings =3D frozen_config.pkgsettings self.target_root =3D frozen_config.target_root