From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 08710138E66 for ; Sun, 23 Feb 2014 08:12:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E922E0B60; Sun, 23 Feb 2014 08:12:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 893CBE0B5A for ; Sun, 23 Feb 2014 08:12:19 +0000 (UTC) Received: from big_daddy.dol-sen.ca (S010600222de111ff.vc.shawcable.net [96.49.5.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 3095833F932 for ; Sun, 23 Feb 2014 08:12:18 +0000 (UTC) From: Brian Dolbec To: gentoo-portage-dev@lists.gentoo.org Subject: [gentoo-portage-dev] [PATCH 1/2] As per bug #472104 add option --verbose-slot-rebuilds=y|n Date: Sun, 23 Feb 2014 00:07:33 -0800 Message-Id: <1393142854-20700-2-git-send-email-dolsen@gentoo.org> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1393142854-20700-1-git-send-email-dolsen@gentoo.org> References: <1393142854-20700-1-git-send-email-dolsen@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: 84804b61-9c4b-4470-96fa-0a0e24a98330 X-Archives-Hash: 727bd28c8860ad1d7079228401965ae8 --- pym/_emerge/actions.py | 5 +++++ pym/_emerge/depgraph.py | 5 +++-- pym/_emerge/main.py | 5 +++++ pym/portage/package/ebuild/config.py | 3 +++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 95c5c14..a3f7813 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2923,6 +2923,11 @@ def adjust_config(myopts, settings): settings["PORTAGE_VERBOSE"] = "1" settings.backup_changes("PORTAGE_VERBOSE") + if ("--verbose-slot-rebuilds" in myopts and + myopts["--verbose-slot-rebuilds"] not in ("y","True")): + settings["VERBOSE_SLOT_REBUILDS"] = "0" + settings.backup_changes("VERBOSE_SLOT_REBUILDS") + # Set so that configs will be merged regardless of remembered status if ("--noconfmem" in myopts): settings["NOCONFMEM"]="1" diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 835bd6b..7cc2ffe 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -7692,8 +7692,9 @@ class depgraph(object): if not unresolved_conflicts: self._show_missed_update() - self._compute_abi_rebuild_info() - self._show_abi_rebuild_info() + if self._frozen_config.settings["VERBOSE_SLOT_REBUILDS"] == "1": + self._compute_abi_rebuild_info() + self._show_abi_rebuild_info() self._show_ignored_binaries() diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 6225fc9..1e21ddb 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -156,6 +156,7 @@ def insert_optional_args(args): '--usepkg' : y_or_n, '--usepkgonly' : y_or_n, '--verbose' : y_or_n, + '--verbose-slot-rebuilds': y_or_n, } short_arg_opts = { @@ -640,6 +641,10 @@ def parse_opts(tmpcmdline, silent=False): "help" : "verbose output", "choices" : true_y_or_n }, + "--verbose-slot-rebuilds": { + "help" : "verbose slot rebuild output", + "choices" : true_y_or_n + }, } parser = ArgumentParser(add_help=False) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index e104501..ba9b502 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -827,6 +827,9 @@ class config(object): "PORTAGE_INST_UID": "0", } + # Turn this on by default + self["VERBOSE_SLOT_REBUILDS"] = "1" + if eprefix: # For prefix environments, default to the UID and GID of # the top-level EROOT directory. -- 1.8.5.3