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 875411389E2 for ; Mon, 8 Dec 2014 19:46:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6AADE0837; Mon, 8 Dec 2014 19:46:57 +0000 (UTC) Received: from mail-wg0-f54.google.com (mail-wg0-f54.google.com [74.125.82.54]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 30578E075F for ; Mon, 8 Dec 2014 19:46:57 +0000 (UTC) Received: by mail-wg0-f54.google.com with SMTP id l2so7086812wgh.27 for ; Mon, 08 Dec 2014 11:46:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:user-agent:mime-version:content-type :content-transfer-encoding:message-id; bh=X+T1J3FCcvAaNLlzN1Z+n7Qj4gXrVPBqUF4g6Q37IQI=; b=e6zimodeNptDCpKHhdCAIuxSnTKwXW4+kvZyoaJUjBn8MkeA2wdO3FSMcLNENWdYq/ OvwjIWpMLE9dPzaQX3+NMQqOYqQsS4spVCCexvWil6LxY+MwJU5KermAGSIKJVkGBsoj 4o+haNmSt8xedX/Z7EsLhR4DECYx0Ldx0l0WAl7aTLCxmekBmJUFpGm2zaGlImTJsNVL KADHXRlqMHAcC1VC2WeFI2ebWU6VqilRjEhpk8sdURIllhe4+ht8A/A+RweSU0dYCtL4 Acx+eM+dUFvYH90tJf2vLhOznfKC9x/WxFPNccjCHHZvYFfkQyw+7I7KuxrrMOXlFTLT Ztpg== X-Received: by 10.180.95.37 with SMTP id dh5mr26704778wib.64.1418068016167; Mon, 08 Dec 2014 11:46:56 -0800 (PST) Received: from afta-picea.localnet (host-94-251-141-202.dynamic.mm.pl. [94.251.141.202]) by mx.google.com with ESMTPSA id r10sm10970662wiy.19.2014.12.08.11.46.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 08 Dec 2014 11:46:55 -0800 (PST) From: Arfrever Frehtes Taifersar Arahesis X-Google-Original-From: Arfrever Frehtes Taifersar Arahesis To: Gentoo Portage Development Subject: [gentoo-portage-dev] [PATCH] Almost always print ::repository Date: Mon, 8 Dec 2014 20:46:21 +0100 User-Agent: KMail (GNU/Linux) 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 MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart6561841.DPjZfHAdDO"; protocol="application/pgp-signature"; micalg=pgp-sha512 Content-Transfer-Encoding: 7bit Message-Id: <201412082046.24559.Arfrever.FTA@gmail.com> X-Archives-Salt: 074dae7a-e9b8-41bc-847c-93ab532d70a0 X-Archives-Hash: 8235b0c44cda26d0f0c9a7a9c4e20bf9 --nextPart6561841.DPjZfHAdDO Content-Type: multipart/mixed; boundary="Boundary-01=_QAghUS4WTNxxG4Q" Content-Transfer-Encoding: 7bit --Boundary-01=_QAghUS4WTNxxG4Q Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline [[[ Almost always print ::repository in list of packages for installation. --verbose-main-repo-display option is now ignored. 3 calls to deprecated portage.repository.config.RepoConfigLoader.mainRepo() function have been deleted. ]]] -- Arfrever Frehtes Taifersar Arahesis --Boundary-01=_QAghUS4WTNxxG4Q Content-Type: text/x-patch; charset="utf-8"; name="portage.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline; filename="portage.patch" =2D-- man/emerge.1 +++ man/emerge.1 @@ -897,9 +897,6 @@ Make slot conflicts more verbose. Note that this may in some cases output hundreds of packages for slot conflicts. .TP =2D.BR "\-\-verbose\-main\-repo\-display" =2DIn the package merge list display, print ::repository even for main repo= sitory. =2D.TP .BR "\-\-verbose\-slot\-rebuilds [ y | n ]" Turns on/off the extra emerge output to list which packages are causing re= builds. The default is set to "y" (on). =2D-- pym/_emerge/depgraph.py +++ pym/_emerge/depgraph.py @@ -4293,14 +4293,9 @@ child =3D None all_parents =3D self._dynamic_config._parent_atoms graph =3D self._dynamic_config.digraph =2D verbose_main_repo_display =3D "--verbose-main-repo-display" in \ =2D self._frozen_config.myopts =20 def format_pkg(pkg): =2D pkg_name =3D "%s" % (pkg.cpv,) =2D if verbose_main_repo_display or pkg.repo !=3D \ =2D pkg.root_config.settings.repositories.mainRepo().name: =2D pkg_name +=3D _repo_separator + pkg.repo + pkg_name =3D "%s%s%s" % (pkg.cpv, _repo_separator, pkg.repo) return pkg_name =20 if target_atom is not None and isinstance(node, Package): =2D-- pym/_emerge/main.py +++ pym/_emerge/main.py @@ -50,6 +50,7 @@ "--tree", "--unordered-display", "--update", +# Option does nowt, but temporarily kept for backward compatibility. "--verbose-main-repo-display", ] =20 =2D-- pym/_emerge/resolver/output.py +++ pym/_emerge/resolver/output.py @@ -387,9 +387,7 @@ if old_pkg.slot !=3D old_pkg.sub_slot or \ old_pkg.slot =3D=3D pkg.slot and old_pkg.sub_slot !=3D pkg.sub_slot: key +=3D "/" + old_pkg.sub_slot =2D if not self.quiet_repo_display and (self.verbose_main_repo_display = or =2D self.portdb.repositories.mainRepo() is None or =2D any(x.repo !=3D self.portdb.repositories.mainRepo().name for x in = myoldbest + [pkg])): + if not self.quiet_repo_display: key +=3D _repo_separator + old_pkg.repo versions.append(key) myoldbest_str =3D blue("["+", ".join(versions)+"]") @@ -422,9 +420,7 @@ @param pkg_info: dictionary @rtype string """ =2D if not self.quiet_repo_display and (self.verbose_main_repo_display or =2D self.portdb.repositories.mainRepo() is None or =2D any(x.repo !=3D self.portdb.repositories.mainRepo().name for x in pkg= _info.oldbest_list + [pkg])): + if not self.quiet_repo_display: pkg_str +=3D _repo_separator + pkg.repo return pkg_str =20 @@ -819,7 +815,6 @@ # and disable the entire repo display in this case. repoadd_set =3D set() =20 =2D 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)): --Boundary-01=_QAghUS4WTNxxG4Q-- --nextPart6561841.DPjZfHAdDO Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCgAGBQJUhgAQAAoJEHgbAhhyXND8CzoP/AuNPzoS6JqnOsvRXUyrARNs E4QaRJ4JkzhlSXh6IJFeE7GUtVG/eaAf9Ljlj/9OrfBDxZYif/ayBq0fi9Vks5gq hCx/fI9oukOGpKltXUe0x8z9A/4ua2eFzukNgoj3laBspTAkMojuQfVDwnXS4AuO lSOQqUEVXZyrsHU94w/EKgCgPDo61uSkizF4dJTxKFg7guPXbH8LTegZ3NYZh7fL HO3OiP6tTlZz583otgNxkQA+7Wn6fL2/eSS7H6HtNQ/ncbkFT/CDjjLEOsA3bSQM /i1avoLHLOgqW8UupO05GVBpDPMwGYFTEX5asa8DEqnviTNG6TpS3+1xHuH8uE6a KR/4JLWRz2dwr7+kOLMLu+/uwwwLc/wUooHFjXvk1/TVxYFv/mdZNvR+KfGnU5/v SMblvrb3x5aM1L/j7OVy/jMyj9sIxIgCEQnqH3NaMABRlRKM50zKLbb5DoWlmuM3 hs8SsJzmVlZGaYMX73YSjCiRYCu/rQ4IUdtASI4zHdhBjNzl0OXWK2XEmzcitgm+ 6Y2bUqR72LcRKgwNWPkyQxrbRmkUp/a7xUKMX56kEiSvUT94C2RUQ5rBIJE2cZLi Mo64XFi69SGxxVcedHGDjReWLbIrfrEUIeTx7o9obDvsNzp6Avw1Dff/ADiCsDVZ v+BusSkat41xQfFTjG7y =02EH -----END PGP SIGNATURE----- --nextPart6561841.DPjZfHAdDO--