[gentoo-portage-dev]

[gentoo-portage-dev]

[Brian Dolbec]

As per bug 472104.  Add the emerge option --verbose-slot-rebuild to have 
the ability to turn off the option.  It is defaulted to "ON".
Second patch is some automatic whitespace cleanup my editor did while working
on this change. 

[gentoo-portage-dev] [PATCH 1/2] As per bug #472104 add option --verbose-slot-rebuilds=y|n

[Brian Dolbec]

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

Re: [gentoo-portage-dev] [PATCH 1/2] As per bug #472104 add option --verbose-slot-rebuilds=y|n

[Sebastian Luther]

Am 23.02.2014 09:07, schrieb Brian Dolbec:
> ---
>  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")

Why do you put that into the config class? In the resolver you should
just do:
 if "--verbose-slot-rebuilds" in self._frozen_config.myopts:

Otherwise looks good.

Re: [gentoo-portage-dev] [PATCH 1/2] As per bug #472104 add option --verbose-slot-rebuilds=y|n

[Brian Dolbec]

On Sun, 23 Feb 2014 18:31:54 +0100
Sebastian Luther <SebastianLuther@gmx.de> wrote:

> Am 23.02.2014 09:07, schrieb Brian Dolbec:
> > ---
> >  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")
> 
> Why do you put that into the config class? In the resolver you should
> just do:
>  if "--verbose-slot-rebuilds" in self._frozen_config.myopts:
> 
> Otherwise looks good.
> 

It is a command line option.  This is where all the other command line
options were defined.  How else is a user going to toggle the option?


And here I was worried about where to define the default...  since it
needs to be defined depgraph.py, I ended up putting it in
pym/portage/package/ebuild/config.py.  That seemed to be the default config.
But since depgraph.py is an _emerge namespace lib, if there is a better
place for it.  Please speak up.

-- 
Brian Dolbec <dolsen>

[gentoo-portage-dev] [PATCH 2/2] Whitespace cleanup

[Brian Dolbec]

---
 pym/_emerge/actions.py | 4 ++--
 pym/_emerge/main.py    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index a3f7813..f3e3b0c 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -3491,7 +3491,7 @@ def expand_set_arguments(myfiles, myaction, root_config):
 	unmerge_actions = ("unmerge", "prune", "clean", "depclean")
 
 	for a in myfiles:
-		if a.startswith(SETPREFIX):		
+		if a.startswith(SETPREFIX):
 				s = a[len(SETPREFIX):]
 				if s not in sets:
 					display_missing_pkg_set(root_config, s)
@@ -3750,7 +3750,7 @@ def run_action(emerge_config):
 		if retval != os.EX_OK:
 			return retval
 
-		# Need to handle empty sets specially, otherwise emerge will react 
+		# Need to handle empty sets specially, otherwise emerge will react
 		# with the help message for empty argument lists
 		if oldargs and not newargs:
 			print("emerge: no targets left after set expansion")
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 1e21ddb..38bbd77 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -81,7 +81,7 @@ COWSAY_MOO = """
  -----------------------
         \   ^__^
          \  (oo)\_______
-            (__)\       )\/\ 
+            (__)\       )\/\
                 ||----w |
                 ||     ||
 
@@ -583,7 +583,7 @@ def parse_opts(tmpcmdline, silent=False):
 			             "packages that have been rebuilt",
 			"choices"  : true_y_or_n
 		},
-		
+
 		"--rebuilt-binaries-timestamp": {
 			"help"   : "use only binaries that are newer than this " + \
 			           "timestamp for --rebuilt-binaries",
@@ -893,7 +893,7 @@ def parse_opts(tmpcmdline, silent=False):
 					(myoptions.load_average,))
 
 		myoptions.load_average = load_average
-	
+
 	if myoptions.rebuilt_binaries_timestamp:
 		try:
 			rebuilt_binaries_timestamp = int(myoptions.rebuilt_binaries_timestamp)
-- 
1.8.5.3

[gentoo-portage-dev] [PATCH v2 0/2] As per bug #472104 add option --verbose-slot-rebuilds=y|n

[Brian Dolbec]

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


After clearing up the communication error between Sebastian and myself...
Him beating me with a clue bat ;)
(That's what I get for answering an email before being fully awake :)

Here is a less involved patch.

Brian Dolbec (2):
  As per bug #472104 add option --verbose-slot-rebuilds=y|n
  Whitespace cleanup

 pym/_emerge/actions.py               |  4 ++--
 pym/_emerge/depgraph.py              |  5 +++--
 pym/_emerge/main.py                  | 11 ++++++++---
 pym/portage/package/ebuild/config.py |  3 +++
 4 files changed, 16 insertions(+), 7 deletions(-)

-- 
1.8.5.3

[gentoo-portage-dev] [PATCH v2 1/2] As per bug #472104 add option --verbose-slot-rebuilds=y|n

[Brian Dolbec]

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

---
 pym/_emerge/depgraph.py              | 5 +++--
 pym/_emerge/main.py                  | 5 +++++
 pym/portage/package/ebuild/config.py | 3 +++
 3 files changed, 11 insertions(+), 2 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: v2-0001-As-per-bug-472104-add-option-verbose-slot-rebuild.patch --]
[-- Type: text/x-patch; name="v2-0001-As-per-bug-472104-add-option-verbose-slot-rebuild.patch", Size: 1646 bytes --]

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 835bd6b..291d18c 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.myopts["--verbose-slot-rebuilds"] != 'n':
+			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.

[gentoo-portage-dev] [PATCH v2 2/2] Whitespace cleanup

[Brian Dolbec]

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

---
 pym/_emerge/actions.py | 4 ++--
 pym/_emerge/main.py    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: v2-0002-Whitespace-cleanup.patch --]
[-- Type: text/x-patch; name="v2-0002-Whitespace-cleanup.patch", Size: 1790 bytes --]

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 95c5c14..9783689 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -3486,7 +3486,7 @@ def expand_set_arguments(myfiles, myaction, root_config):
 	unmerge_actions = ("unmerge", "prune", "clean", "depclean")
 
 	for a in myfiles:
-		if a.startswith(SETPREFIX):		
+		if a.startswith(SETPREFIX):
 				s = a[len(SETPREFIX):]
 				if s not in sets:
 					display_missing_pkg_set(root_config, s)
@@ -3745,7 +3745,7 @@ def run_action(emerge_config):
 		if retval != os.EX_OK:
 			return retval
 
-		# Need to handle empty sets specially, otherwise emerge will react 
+		# Need to handle empty sets specially, otherwise emerge will react
 		# with the help message for empty argument lists
 		if oldargs and not newargs:
 			print("emerge: no targets left after set expansion")
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 1e21ddb..38bbd77 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -81,7 +81,7 @@ COWSAY_MOO = """
  -----------------------
         \   ^__^
          \  (oo)\_______
-            (__)\       )\/\ 
+            (__)\       )\/\
                 ||----w |
                 ||     ||
 
@@ -583,7 +583,7 @@ def parse_opts(tmpcmdline, silent=False):
 			             "packages that have been rebuilt",
 			"choices"  : true_y_or_n
 		},
-		
+
 		"--rebuilt-binaries-timestamp": {
 			"help"   : "use only binaries that are newer than this " + \
 			           "timestamp for --rebuilt-binaries",
@@ -893,7 +893,7 @@ def parse_opts(tmpcmdline, silent=False):
 					(myoptions.load_average,))
 
 		myoptions.load_average = load_average
-	
+
 	if myoptions.rebuilt_binaries_timestamp:
 		try:
 			rebuilt_binaries_timestamp = int(myoptions.rebuilt_binaries_timestamp)

[gentoo-portage-dev] [As per bug #472104 add option --verbose-slot-rebuilds

[Brian Dolbec]

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


Hopefully there isn't anything else Seabastian finds in this one.

Thank you Sebastian for your review and fixes :)

Brian Dolbec (2):
  As per bug #472104 add option --verbose-slot-rebuilds=y|n
  Whitespace cleanup

 pym/_emerge/actions.py  |  4 ++--
 pym/_emerge/depgraph.py |  5 +++--
 pym/_emerge/main.py     | 11 ++++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

-- 
1.8.5.3

[gentoo-portage-dev] [As per bug #472104 add option --verbose-slot-rebuildsAs per bug #472104 add option --verbose-slot-rebuilds=y|n

[Brian Dolbec]

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

---
 pym/_emerge/depgraph.py | 5 +++--
 pym/_emerge/main.py     | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: v3-0001-As-per-bug-472104-add-option-verbose-slot-rebuild.patch --]
[-- Type: text/x-patch; name="v3-0001-As-per-bug-472104-add-option-verbose-slot-rebuild.patch", Size: 1182 bytes --]

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 835bd6b..04d7aae 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.myopts.get("--verbose-slot-rebuilds", 'y') != 'n':
+			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)

[gentoo-portage-dev] [As per bug #472104 add option --verbose-slot-rebuildsWhitespace cleanup

[Brian Dolbec]

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

---
 pym/_emerge/actions.py | 4 ++--
 pym/_emerge/main.py    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: v3-0002-Whitespace-cleanup.patch --]
[-- Type: text/x-patch; name="v3-0002-Whitespace-cleanup.patch", Size: 1790 bytes --]

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 95c5c14..9783689 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -3486,7 +3486,7 @@ def expand_set_arguments(myfiles, myaction, root_config):
 	unmerge_actions = ("unmerge", "prune", "clean", "depclean")
 
 	for a in myfiles:
-		if a.startswith(SETPREFIX):		
+		if a.startswith(SETPREFIX):
 				s = a[len(SETPREFIX):]
 				if s not in sets:
 					display_missing_pkg_set(root_config, s)
@@ -3745,7 +3745,7 @@ def run_action(emerge_config):
 		if retval != os.EX_OK:
 			return retval
 
-		# Need to handle empty sets specially, otherwise emerge will react 
+		# Need to handle empty sets specially, otherwise emerge will react
 		# with the help message for empty argument lists
 		if oldargs and not newargs:
 			print("emerge: no targets left after set expansion")
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 1e21ddb..38bbd77 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -81,7 +81,7 @@ COWSAY_MOO = """
  -----------------------
         \   ^__^
          \  (oo)\_______
-            (__)\       )\/\ 
+            (__)\       )\/\
                 ||----w |
                 ||     ||
 
@@ -583,7 +583,7 @@ def parse_opts(tmpcmdline, silent=False):
 			             "packages that have been rebuilt",
 			"choices"  : true_y_or_n
 		},
-		
+
 		"--rebuilt-binaries-timestamp": {
 			"help"   : "use only binaries that are newer than this " + \
 			           "timestamp for --rebuilt-binaries",
@@ -893,7 +893,7 @@ def parse_opts(tmpcmdline, silent=False):
 					(myoptions.load_average,))
 
 		myoptions.load_average = load_average
-	
+
 	if myoptions.rebuilt_binaries_timestamp:
 		try:
 			rebuilt_binaries_timestamp = int(myoptions.rebuilt_binaries_timestamp)

Re: [gentoo-portage-dev] [As per bug #472104 add option --verbose-slot-rebuilds

[Sebastian Luther]

Am 23.02.2014 21:02, schrieb Brian Dolbec:
> 
> Hopefully there isn't anything else Seabastian finds in this one.
> 
> Thank you Sebastian for your review and fixes :)

Looks good now.

> 
> Brian Dolbec (2):
>   As per bug #472104 add option --verbose-slot-rebuilds=y|n
>   Whitespace cleanup
> 
>  pym/_emerge/actions.py  |  4 ++--
>  pym/_emerge/depgraph.py |  5 +++--
>  pym/_emerge/main.py     | 11 ++++++++---
>  3 files changed, 13 insertions(+), 7 deletions(-)
>