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 1S7VQU-0001qW-GA for garchives@archives.gentoo.org; Tue, 13 Mar 2012 17:22:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E996E0A9C; Tue, 13 Mar 2012 17:22:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D2256E0A9C for ; Tue, 13 Mar 2012 17:22:14 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 13D0A1B405C for ; Tue, 13 Mar 2012 17:22:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C0D47E5402 for ; Tue, 13 Mar 2012 17:22:12 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1331659143.970ab392337a0584c9a329c55c58e3b930ae4af1.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/resolver/output.py X-VCS-Directories: pym/_emerge/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 970ab392337a0584c9a329c55c58e3b930ae4af1 X-VCS-Branch: master Date: Tue, 13 Mar 2012 17:22:12 +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: 6d748c86-3074-4284-a2f9-49e28306c0a6 X-Archives-Hash: f1bfe8df2e62ab3f58f582db571aaf6a commit: 970ab392337a0584c9a329c55c58e3b930ae4af1 Author: Martin von Gagern gmx net> AuthorDate: Tue Mar 13 17:15:26 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Mar 13 17:19:03 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D970ab392 Display: spawn pkg_nofetch when appropriate Signed-off-by: Zac Medico gentoo.org> --- pym/_emerge/resolver/output.py | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output= .py index ef000d6..53ec4f0 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -15,6 +15,7 @@ from portage import _unicode_decode from portage.dbapi.dep_expand import dep_expand from portage.dep import cpvequal, _repo_separator from portage.exception import InvalidDependString, SignatureException +from portage.package.ebuild._spawn_nofetch import spawn_nofetch from portage.output import ( blue, bold, colorize, create_color_func, darkblue, darkgreen, green, nc_len, red, teal, turquoise, yellow ) bad =3D create_color_func("BAD") @@ -668,7 +669,6 @@ class Display(object): pkg_info.use =3D list(self.conf.pkg_use_enabled(pkg)) if not pkg.built and pkg.operation =3D=3D 'merge' and \ 'fetch' in pkg.metadata.restrict: - pkg_info.fetch_symbol =3D red("F") if pkg_info.ordered: self.counters.restrict_fetch +=3D 1 if not self.portdb.getfetchsizes(pkg.cpv, @@ -676,6 +676,10 @@ class Display(object): pkg_info.fetch_symbol =3D green("f") if pkg_info.ordered: self.counters.restrict_fetch_satisfied +=3D 1 + else: + pkg_info.fetch_symbol =3D red("F") + if pkg_info.ebuild_path is not None: + self.restrict_fetch_list[pkg] =3D pkg_info return pkg_info =20 =20 @@ -821,6 +825,7 @@ class Display(object): repoadd_set =3D set() =20 self.verbose_main_repo_display =3D "--verbose-main-repo-display" in de= pgraph._frozen_config.myopts + self.restrict_fetch_list =3D {} =20 for mylist_index in range(len(mylist)): pkg, depth, ordered =3D mylist[mylist_index] @@ -905,6 +910,12 @@ class Display(object): self.print_blockers() if self.conf.verbosity =3D=3D 3: self.print_verbose(show_repos) + for pkg, pkg_info in self.restrict_fetch_list.items(): + writemsg_stdout("\nFetch instructions for %s:\n" % (pkg.cpv,), + noiselevel=3D-1) + spawn_nofetch(self.conf.trees[pkg.root]["porttree"].dbapi, + pkg_info.ebuild_path, + settings=3Dself.conf.pkgsettings[pkg.root]) if self.conf.changelog: self.print_changelog() =20