[gentoo-portage-dev] [PATCH] Almost always print ::repository

[gentoo-portage-dev] [PATCH] Almost always print ::repository

[Arfrever Frehtes Taifersar Arahesis]

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

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

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

--- 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
-.BR "\-\-verbose\-main\-repo\-display"
-In the package merge list display, print ::repository even for main repository.
-.TP
 .BR "\-\-verbose\-slot\-rebuilds [ y | n ]"
 Turns on/off the extra emerge output to list which packages are causing rebuilds.
 The default is set to "y" (on).
--- pym/_emerge/depgraph.py
+++ pym/_emerge/depgraph.py
@@ -4293,14 +4293,9 @@
 		child = None
 		all_parents = self._dynamic_config._parent_atoms
 		graph = self._dynamic_config.digraph
-		verbose_main_repo_display = "--verbose-main-repo-display" in \
-			self._frozen_config.myopts
 
 		def format_pkg(pkg):
-			pkg_name = "%s" % (pkg.cpv,)
-			if verbose_main_repo_display or pkg.repo != \
-				pkg.root_config.settings.repositories.mainRepo().name:
-				pkg_name += _repo_separator + pkg.repo
+			pkg_name = "%s%s%s" % (pkg.cpv, _repo_separator, pkg.repo)
 			return pkg_name
 
 		if target_atom is not None and isinstance(node, Package):
--- 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",
 ]
 
--- pym/_emerge/resolver/output.py
+++ pym/_emerge/resolver/output.py
@@ -387,9 +387,7 @@
 						if old_pkg.slot != old_pkg.sub_slot or \
 							old_pkg.slot == pkg.slot and old_pkg.sub_slot != pkg.sub_slot:
 							key += "/" + old_pkg.sub_slot
-					if not self.quiet_repo_display and (self.verbose_main_repo_display or
-						self.portdb.repositories.mainRepo() is None or
-						any(x.repo != self.portdb.repositories.mainRepo().name for x in myoldbest + [pkg])):
+					if not self.quiet_repo_display:
 						key += _repo_separator + old_pkg.repo
 				versions.append(key)
 			myoldbest_str = blue("["+", ".join(versions)+"]")
@@ -422,9 +420,7 @@
 		@param pkg_info: dictionary
 		@rtype string
 		"""
-		if not self.quiet_repo_display and (self.verbose_main_repo_display or
-			self.portdb.repositories.mainRepo() is None or
-			any(x.repo != self.portdb.repositories.mainRepo().name for x in pkg_info.oldbest_list + [pkg])):
+		if not self.quiet_repo_display:
 			pkg_str += _repo_separator + pkg.repo
 		return pkg_str
 
@@ -819,7 +815,6 @@
 			# and disable the entire repo display in this case.
 			repoadd_set = set()
 
-		self.verbose_main_repo_display = "--verbose-main-repo-display" in depgraph._frozen_config.myopts
 		self.restrict_fetch_list = {}
 
 		for mylist_index in range(len(mylist)):

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

Re: [gentoo-portage-dev] [PATCH] Almost always print ::repository

[Brian Dolbec]

[-- Attachment #1: Type: text/plain, Size: 646 bytes --]

On Mon, 8 Dec 2014 20:46:21 +0100
Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> wrote:

> +++ 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",
>  ]


+++ pym/_emerge/main.py
@@ -50,6 +50,7 @@
 "--tree",
 "--unordered-display",
 "--update",
+# Option does nowt, but temporarily kept for backward compatibility.

                ^^^  what the hell is that, another olde English word ;)


 "--verbose-main-repo-display",
 ]


-- 
Brian Dolbec <dolsen>


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 951 bytes --]

Re: [gentoo-portage-dev] [PATCH] Almost always print ::repository

[Alexander Berntsen]

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

On 08/12/14 22:05, Brian Dolbec wrote:
> ^^^  what the hell is that, another olde English word ;)
Nowt => Naught => Nothing
Owt  => Aught  => Anything

They are prominently used today as well.


As for the patch itself: I like the idea, but where is this requested?
Do users actually want it? Also, I would prefer to remove the old
option entirely.
- -- 
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iF4EAREIAAYFAlSGszkACgkQRtClrXBQc7XROwD+PnBiyivmwJ7x8+x7Qe+TgGSs
JfvdZPDtxwgaGXoTT8oA/ixK1djJa5SDQTiuQ+tVVOgRFxo69PTaXM0g6o/rGpcR
=j3fc
-----END PGP SIGNATURE-----

Re: [gentoo-portage-dev] [PATCH] Almost always print ::repository

[Arfrever Frehtes Taifersar Arahesis]

[-- Attachment #1: Type: Text/Plain, Size: 415 bytes --]

2014-12-09 09:30 Alexander Berntsen napisał(a):
> As for the patch itself: I like the idea, but where is this requested?

It is part of work for deleting any remaining uses of deprecated PORTDIR, PORTDIR_OVERLAY and SYNC variables,
mainRepo() and mainRepoLocation() functions, main-repo attribute.

> Also, I would prefer to remove the old option entirely.

OK.

--
Arfrever Frehtes Taifersar Arahesis

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

Re: [gentoo-portage-dev] [PATCH] Almost always print ::repository

[Arfrever Frehtes Taifersar Arahesis]

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

[[[
Almost always print ::repository in list of packages for installation.

--verbose-main-repo-display option is no longer supported.
3 calls to deprecated portage.repository.config.RepoConfigLoader.mainRepo() function
have been deleted.
]]]

--
Arfrever Frehtes Taifersar Arahesis

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

--- 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
-.BR "\-\-verbose\-main\-repo\-display"
-In the package merge list display, print ::repository even for main repository.
-.TP
 .BR "\-\-verbose\-slot\-rebuilds [ y | n ]"
 Turns on/off the extra emerge output to list which packages are causing rebuilds.
 The default is set to "y" (on).
--- pym/_emerge/depgraph.py
+++ pym/_emerge/depgraph.py
@@ -4293,14 +4293,9 @@
 		child = None
 		all_parents = self._dynamic_config._parent_atoms
 		graph = self._dynamic_config.digraph
-		verbose_main_repo_display = "--verbose-main-repo-display" in \
-			self._frozen_config.myopts
 
 		def format_pkg(pkg):
-			pkg_name = "%s" % (pkg.cpv,)
-			if verbose_main_repo_display or pkg.repo != \
-				pkg.root_config.settings.repositories.mainRepo().name:
-				pkg_name += _repo_separator + pkg.repo
+			pkg_name = "%s%s%s" % (pkg.cpv, _repo_separator, pkg.repo)
 			return pkg_name
 
 		if target_atom is not None and isinstance(node, Package):
--- pym/_emerge/main.py
+++ pym/_emerge/main.py
@@ -50,7 +50,6 @@
 "--tree",
 "--unordered-display",
 "--update",
-"--verbose-main-repo-display",
 ]
 
 shortmapping={
--- pym/_emerge/resolver/output.py
+++ pym/_emerge/resolver/output.py
@@ -387,9 +387,7 @@
 						if old_pkg.slot != old_pkg.sub_slot or \
 							old_pkg.slot == pkg.slot and old_pkg.sub_slot != pkg.sub_slot:
 							key += "/" + old_pkg.sub_slot
-					if not self.quiet_repo_display and (self.verbose_main_repo_display or
-						self.portdb.repositories.mainRepo() is None or
-						any(x.repo != self.portdb.repositories.mainRepo().name for x in myoldbest + [pkg])):
+					if not self.quiet_repo_display:
 						key += _repo_separator + old_pkg.repo
 				versions.append(key)
 			myoldbest_str = blue("["+", ".join(versions)+"]")
@@ -422,9 +420,7 @@
 		@param pkg_info: dictionary
 		@rtype string
 		"""
-		if not self.quiet_repo_display and (self.verbose_main_repo_display or
-			self.portdb.repositories.mainRepo() is None or
-			any(x.repo != self.portdb.repositories.mainRepo().name for x in pkg_info.oldbest_list + [pkg])):
+		if not self.quiet_repo_display:
 			pkg_str += _repo_separator + pkg.repo
 		return pkg_str
 
@@ -819,7 +815,6 @@
 			# and disable the entire repo display in this case.
 			repoadd_set = set()
 
-		self.verbose_main_repo_display = "--verbose-main-repo-display" in depgraph._frozen_config.myopts
 		self.restrict_fetch_list = {}
 
 		for mylist_index in range(len(mylist)):

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

Re: [gentoo-portage-dev] [PATCH] Almost always print ::repository

[Zac Medico]

On 12/10/2014 12:33 PM, Arfrever Frehtes Taifersar Arahesis wrote:
> [[[
> Almost always print ::repository in list of packages for installation.
> 
> --verbose-main-repo-display option is no longer supported.
> 3 calls to deprecated portage.repository.config.RepoConfigLoader.mainRepo() function
> have been deleted.
> ]]]
> 
> --
> Arfrever Frehtes Taifersar Arahesis
> 

LGTM.
-- 
Thanks,
Zac

Re: [gentoo-portage-dev] [PATCH] Almost always print ::repository

[Brian Dolbec]

[-- Attachment #1: Type: text/plain, Size: 486 bytes --]

On Wed, 10 Dec 2014 21:33:06 +0100
Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> wrote:

> [[[
> Almost always print ::repository in list of packages for installation.
> 
> --verbose-main-repo-display option is no longer supported.
> 3 calls to deprecated
> portage.repository.config.RepoConfigLoader.mainRepo() function have
> been deleted. ]]]
> 
> --
> Arfrever Frehtes Taifersar Arahesis


yeah, go ahead, merge.  Thanks
-- 
Brian Dolbec <dolsen>


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 951 bytes --]