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 814451389E2 for ; Sat, 13 Dec 2014 08:08:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38FE1E08FB; Sat, 13 Dec 2014 08:08:31 +0000 (UTC) Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 830D6E08F8 for ; Sat, 13 Dec 2014 08:08:30 +0000 (UTC) Received: by mail-wg0-f51.google.com with SMTP id x12so10668003wgg.24 for ; Sat, 13 Dec 2014 00:08:29 -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=28L3sEMspGs/8EogTNvD+mLD2X7vAMmvsniUFW4bgjU=; b=qn3iEmLgdtqes5qsfhfimJXojBsU5NSeu0xjxqOdMxc4VHHx7VJLtdwpT7O6nOBCHb ccQAncG8ALYQM+m6Djvfkz1fYbxzETD3670YfI0pbEq/GHMbYGr/2Lhz6tF8OhMnyWat EXMO/C8Z+YsgaUhjIYOcHNMGNA62b/sVc7EUlwSi2hcukUVgJssmc9/jwjT9pG4YCpd+ Kcm1VpPr8PRoUASr9AXeR5fusU5NY93wj2ZF5QWcs6kMVoT+lZK/gFAHpnxV+rCba+Ev 6JxoMm1xbSEG9nnPBc5H+8rjLQDF6loGtJT1YpS/DcVLWiuh2+jskMx0UC1c2Wne/8vT Ci/A== X-Received: by 10.194.121.228 with SMTP id ln4mr4221460wjb.108.1418458109338; Sat, 13 Dec 2014 00:08:29 -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 p14sm4922748wie.1.2014.12.13.00.08.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 13 Dec 2014 00:08:28 -0800 (PST) From: Arfrever Frehtes Taifersar Arahesis X-Google-Original-From: Arfrever Frehtes Taifersar Arahesis To: Gentoo Portage Development Subject: [gentoo-portage-dev] [PATCH] emerge --verbose --quiet-repo-display: Delete deprecated code Date: Sat, 13 Dec 2014 09:08:02 +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="nextPart1536842.DDbXOLWfW7"; protocol="application/pgp-signature"; micalg=pgp-sha512 Content-Transfer-Encoding: 7bit Message-Id: <201412130908.03335.Arfrever.FTA@gmail.com> X-Archives-Salt: e97a3ee4-067e-4219-b876-c37c7e83e764 X-Archives-Hash: ffb36ba155d884bf7313cd9ef458ef68 --nextPart1536842.DDbXOLWfW7 Content-Type: multipart/mixed; boundary="Boundary-01=_jP/iU3VNE+soQlZ" Content-Transfer-Encoding: 7bit --Boundary-01=_jP/iU3VNE+soQlZ Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline [[[ emerge --verbose --quiet-repo-display: Delete deprecated code. Use portage.repository.config.RepoConfigLoader.__iter__() instead of deprecated PORTDIR and PORTDIR_OVERLAY. 1 call to deprecated portage.repository.config.RepoConfigLoader.mainRepoLocation() has been deleted. ]]] -- Arfrever Frehtes Taifersar Arahesis --Boundary-01=_jP/iU3VNE+soQlZ Content-Type: text/x-patch; charset="utf-8"; name="portage.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline; filename="portage.patch" =2D-- pym/_emerge/resolver/output_helpers.py +++ pym/_emerge/resolver/output_helpers.py @@ -39,24 +39,13 @@ self._unknown_repo =3D False repo_paths =3D set() for root_config in roots.values(): =2D portdir =3D root_config.settings.get("PORTDIR") =2D if portdir: =2D repo_paths.add(portdir) =2D overlays =3D root_config.settings.get("PORTDIR_OVERLAY") =2D if overlays: =2D repo_paths.update(shlex_split(overlays)) + for repo in root_config.settings.repositories: + repo_paths.add(repo.location) repo_paths =3D list(repo_paths) self._repo_paths =3D repo_paths self._repo_paths_real =3D [ os.path.realpath(repo_path) \ for repo_path in repo_paths ] =20 =2D # pre-allocate index for PORTDIR so that it always has index 0. =2D for root_config in roots.values(): =2D portdb =3D root_config.trees["porttree"].dbapi =2D portdir =3D portdb.repositories.mainRepoLocation() =2D if portdir: =2D self.repoStr(portdir) =2D def repoStr(self, repo_path_real): real_index =3D -1 if repo_path_real: @@ -80,7 +69,7 @@ shown_repos =3D self._shown_repos unknown_repo =3D self._unknown_repo if shown_repos or self._unknown_repo: =2D output.append("Portage tree and overlays:\n") + output.append("Repositories:\n") show_repo_paths =3D list(shown_repos) for repo_path, repo_index in shown_repos.items(): show_repo_paths[repo_index] =3D repo_path --Boundary-01=_jP/iU3VNE+soQlZ-- --nextPart1536842.DDbXOLWfW7 Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCgAGBQJUi/PjAAoJEHgbAhhyXND8eWMP+wUELCfN61D6z3WpT+If/bMK yfOgA4oiLjIrgomkJp+AcDsRiUznNH4BmauABNZ1AXGelWUTmTIsN7VEcYehlSP1 LebovoZ7ziki6jyyRpnWSR0HPhknixPa2jC4aaR1m5yJqNd7s5bhU/W5IGkcREJE RGlzztcMF3dCjnO7mSOyMTi1UR5ZtZ1cGrEPr5drW2b5jfh+oPebjFe+QPd2kT7F vnH2C8YwJMvMwCreJuaFHgs2ASmKvGUzhfChBfpKZYpXZAFkwIPiCTNL5clOAsMz eW8suIbidseHGU9UGM86khtdacn5jCCePGJbLpHDkl0zwvgZTEOXvk1IgVaeINdE zGQgBvz9l3SVnIvqQfWnoTeOU+/mFxoZ93Hi8YWbB6M2Luot8xys5acZ1dy7/JBY fT4LHdKFc0H7fE3kCCMch9jtF2AvqXFtw1ommDLEjKAbDcdZmnOgsnGYdp8/cqkg YC0rRiLjTP+XVFAZXOFI1uDQHcB7QHMfHM4QvUL7TMHb1q6naRo+Kpf9R9761tEk TuxsoqgpChU8brUPaVUmC9P/l0qudbbIOGSvIW3Cshz9wK8vnart4Gqt/M9By16V nRBfpzVNSULE7QuXEUKuQ6QeLeFdq9a692ZmmAtqY5Y0+QDKQEq12Vc7UVyQmhaV hrtPGp+yhr1bP2sFNBBl =/EFC -----END PGP SIGNATURE----- --nextPart1536842.DDbXOLWfW7--