[gentoo-portage-dev] [PATCH] emerge --verbose --quiet-repo-display: Delete deprecated code

[gentoo-portage-dev] [PATCH] emerge --verbose --quiet-repo-display: Delete deprecated code

[Arfrever Frehtes Taifersar Arahesis]

[-- Attachment #1.1: Type: Text/Plain, Size: 322 bytes --]

[[[
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

[-- Attachment #1.2: portage.patch --]
[-- Type: text/x-patch, Size: 1382 bytes --]

--- pym/_emerge/resolver/output_helpers.py
+++ pym/_emerge/resolver/output_helpers.py
@@ -39,24 +39,13 @@
 		self._unknown_repo = False
 		repo_paths = set()
 		for root_config in roots.values():
-			portdir = root_config.settings.get("PORTDIR")
-			if portdir:
-				repo_paths.add(portdir)
-			overlays = root_config.settings.get("PORTDIR_OVERLAY")
-			if overlays:
-				repo_paths.update(shlex_split(overlays))
+			for repo in root_config.settings.repositories:
+				repo_paths.add(repo.location)
 		repo_paths = list(repo_paths)
 		self._repo_paths = repo_paths
 		self._repo_paths_real = [ os.path.realpath(repo_path) \
 			for repo_path in repo_paths ]
 
-		# pre-allocate index for PORTDIR so that it always has index 0.
-		for root_config in roots.values():
-			portdb = root_config.trees["porttree"].dbapi
-			portdir = portdb.repositories.mainRepoLocation()
-			if portdir:
-				self.repoStr(portdir)
-
 	def repoStr(self, repo_path_real):
 		real_index = -1
 		if repo_path_real:
@@ -80,7 +69,7 @@
 		shown_repos = self._shown_repos
 		unknown_repo = self._unknown_repo
 		if shown_repos or self._unknown_repo:
-			output.append("Portage tree and overlays:\n")
+			output.append("Repositories:\n")
 		show_repo_paths = list(shown_repos)
 		for repo_path, repo_index in shown_repos.items():
 			show_repo_paths[repo_index] = repo_path

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-portage-dev] [PATCH] emerge --verbose --quiet-repo-display: Delete deprecated code

[Alexander Berntsen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

LGTM.

- -- 
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iF4EAREIAAYFAlSMP2QACgkQRtClrXBQc7XZgQD9GbzeRGrm8t7F//CFcKB6vIxS
vK9W61OU+RNmcXcHP/wA/1QCjntU3rXCHQURrS3Vl+q4I94rfTbCa498IFglMRRd
=Uswa
-----END PGP SIGNATURE-----

Re: [gentoo-portage-dev] [PATCH] emerge --verbose --quiet-repo-display: Delete deprecated code

[Brian Dolbec]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

On Sat, 13 Dec 2014 14:30:12 +0100
Alexander Berntsen <bernalex@gentoo.org> wrote:

> 
> LGTM.
> 
> - -- 
> Alexander
> bernalex@gentoo.org
> https://secure.plaimi.net/~alexander
> 

Yes, but hold off pushing this one for a bit.

I need to think about when we can stabilize layman with the repos.conf
support.  If this hits the tree in a regular release before a layman
release is stable. We'll be hearing a lot of flak over it.

I think we should be able to start a layman stabilization soon... need
to check on bugs, etc..
- -- 
Brian Dolbec <dolsen>

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0

iQJ8BAEBCgBmBQJUjFMcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2OUZEQTI0MjY5QzhCNUE3RTlFMjMxRTkw
MTg2ODIyMzFCOTI2RTRGAAoJEAGGgiMbkm5PxVMP/Ryn+yqmFMoJ/DNb2yTcExfV
n+8NEZ2IlNBWEnc0haRfsCkQmGgiSK0jAZANxYHf3y48JvoTyl1GDnYmGTHxQ5dq
CRFAo5Zw9KMcQfHIMw9Ziy/6llWD4cJ9kK5sFmT8QEAJttvzXwYvCTxIJRpsEHDZ
rvm87wyJwHoPbTCnatDgcjeGn8WEbsWf2w+c/ZYR+zvfisH4MwITiT7blUteDy1R
iJ0CBElr7m2QPEm9Pg/fJFuJk32EJCFl7CaF/97U8v3nmg3S+vv/RGJYjXEKW0//
dsxyNNU+f3Bgslkq9oTomxjo7f5LoH58M4aRdy8ZxtsQcYbfwYTXjrveQynXXlJG
w4XosjJTU6yRJ4NdBoiRdONgWnbK1rWIN/S2zAGmMQ0hsevXKi8BZiLWM/9M6RsB
aUyIppBEzuPPlLqoSVrUp2McdcyTjJ2JIxn+0GRtfFKbgSF3hUPXi7cu02Joe06D
u1328RZoynj4ix2pXVefg6gOGUfz2fU+G7yH60FT1XjzGJjhBJ4ygjbWSJ1lKNSR
MZS6CZnZi70vTKpvjtKDyTV6oLd+4J1qkU+t81mhAtECo8rbxEjen71fptEevyRv
6h9CSw+zQ/eWBSSH37qDkM2GZ76uWdOSA0yH0HmMszN4uEGm0S9G+zp3lZm5jlZ8
31LKN+vk/85IiUfspPMD
=2YxE
-----END PGP SIGNATURE-----