[gentoo-portage-dev]

[gentoo-portage-dev]

[Niklas Lindblad]

-- 
gentoo-portage-dev@gentoo.org mailing list

[gentoo-portage-dev]

[Шурмин Евгений Викторович]

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

 


[-- Attachment #2: Type: text/html, Size: 1087 bytes --]

[gentoo-portage-dev]

[Шурмин Евгений Викторович]

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

 

 

С уважением, Шурмин Евгений.

Системный администратор банка OOO ИКБ "Стройсевзапбанк"

www.bankfamily.ru

 


[-- Attachment #2: Type: text/html, Size: 2243 bytes --]

[gentoo-portage-dev]

[Tony]

Hi, I am new, but I think I found a problem in thr portage tree, dealing with texlive and tetex. I have a personal overlay, where I changed the dependency in the ebuild from "dev-text/tetex" to "virtual/latex-base." This solved it for the package.

I think that the packages will have to transition, because of these conflicts. Also, let me know if this is the right way to do this, and if it is, I suggest you do it soon. (It gets annoying)
 
Tony







      ____________________________________________________________________________________
Looking for last minute shopping deals?  
Find them fast with Yahoo! Search.  http://tools.search.yahoo.com/newsearch/category.php?category=shopping
-- 
gentoo-portage-dev@lists.gentoo.org mailing list

Re: [gentoo-portage-dev]

[Andrew Gaffney]

Tony wrote:
> Hi, I am new, but I think I found a problem in thr portage tree, dealing with texlive and tetex. I have a personal overlay, where I changed the dependency in the ebuild from "dev-text/tetex" to "virtual/latex-base." This solved it for the package.
> 
> I think that the packages will have to transition, because of these conflicts. Also, let me know if this is the right way to do this, and if it is, I suggest you do it soon. (It gets annoying)

Don't post without a subject. That's really annoying.

Also, this is completely off-topic for this list. Please file a bug at 
http://bugs.gentoo.org/

-- 
Andrew Gaffney                                 http://dev.gentoo.org/~agaffney/
Gentoo Linux Developer             Catalyst/Installer + x86 release coordinator
-- 
gentoo-portage-dev@lists.gentoo.org mailing list

[gentoo-portage-dev]

[SebastianLuther]

Changes:

* restrict check to runtime dependencies
* don't skip the check for atoms with slots, but only for slot+sub-slot
* fix typo found by Ryan

[gentoo-portage-dev]

[Alexander Berntsen]

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


- -- 
Alexander
alexander@plaimi.net
http://plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iF4EAREIAAYFAlLnjOMACgkQRtClrXBQc7UWQAD8CjdMTbWDlIUDL4NPG3ppY5TU
V+IIdrAsroAnNNaKq+QA/2q/MVyQmhOMjw2TUhWRkHHph8OiJ9UJxwPQTHeqb518
=6kSU
-----END PGP SIGNATURE-----

Re: [gentoo-portage-dev]

[Alexander Berntsen]

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

Ooops. Disregard. Am resubscribing with my go account.

- -- 
Alexander
alexander@plaimi.net
http://plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iF4EAREIAAYFAlLnjR4ACgkQRtClrXBQc7XEZgEAkm5P1fvKPfqwKUOxzEWktbZn
4PVCz5Qvacedu3xKcM8A/2phDSlpffiOfRGD0VyUNtPvoOoI0hMvMYxLqhrhFlT0
=5jaI
-----END PGP SIGNATURE-----

[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

[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

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

[gentoo-portage-dev]

[Zac Medico]

In addition to indexed search, this patch series implements
stream-based incremental display of search results (fixing bug
#412471).

I'll be maintaining this patch series in the following branch:

	https://github.com/zmedico/portage/tree/bug_525718_stream

The old non-incremental version of this patch series is still
available here:

	https://github.com/zmedico/portage/tree/bug_525718

Re: [gentoo-portage-dev]

[Brian Dolbec]

On Sat,  1 Nov 2014 15:46:18 -0700
Zac Medico <zmedico@gentoo.org> wrote:

> In addition to indexed search, this patch series implements
> stream-based incremental display of search results (fixing bug
> #412471).
> 
> I'll be maintaining this patch series in the following branch:
> 
> 	https://github.com/zmedico/portage/tree/bug_525718_stream
> 
> The old non-incremental version of this patch series is still
> available here:
> 
> 	https://github.com/zmedico/portage/tree/bug_525718
> 
> 

Zac, while the code looks good, testing has showed a significant drop
in performance for a -s search while it is greatly improves for a -S
search.

big_daddy portage # time emerge -s porthole
!!! Repository 'vdr-devel' has sync-type attribute set to unsupported value: 'layman'
!!! Repository 'wtk' has sync-type attribute set to unsupported value: 'layman'
  
[ Results for search key : porthole ]
Searching...    
*  app-portage/porthole
      Latest version available: 0.6.1-r3
      Latest version installed: 0.6.1-r3
      Size of files: 937 KiB
      Homepage:      http://porthole.sourceforge.net
      Description:   A GTK+-based frontend to Portage
      License:       GPL-2

[ Applications found : 1 ]


real	0m5.509s
user	0m5.181s
sys	0m0.321s
big_daddy portage # time /usr/bin/emerge -s porthole
!!! Repository 'vdr-devel' has sync-type attribute set to unsupported value: 'layman'
!!! Repository 'wtk' has sync-type attribute set to unsupported value: 'layman'
Searching...    
[ Results for search key : porthole ]
[ Applications found : 1 ]

*  app-portage/porthole
      Latest version available: 0.6.1-r3
      Latest version installed: 0.6.1-r3
      Size of files: 937 KiB
      Homepage:      http://porthole.sourceforge.net
      Description:   A GTK+-based frontend to Portage
      License:       GPL-2


real	0m3.431s
user	0m3.024s
sys	0m0.401s
big_daddy portage # emerge --version
!!! Repository 'vdr-devel' has sync-type attribute set to unsupported value: 'layman'
!!! Repository 'wtk' has sync-type attribute set to unsupported value: 'layman'
Portage 2.2.14_p28 (python 3.3.5-final-0, default/linux/amd64/13.0/desktop, gcc-4.8.3, glibc-2.19-r1, 3.16.1-gentoo x86_64)
big_daddy portage # /usr/bin/emerge --version
!!! Repository 'vdr-devel' has sync-type attribute set to unsupported value: 'layman'
!!! Repository 'wtk' has sync-type attribute set to unsupported value: 'layman'
Portage 2.2.14 (python 3.3.5-final-0, default/linux/amd64/13.0/desktop, gcc-4.8.3, glibc-2.19-r1, 3.16.1-gentoo x86_64)
big_daddy portage # time esearch porthole
[ Results for search key : porthole ]
[ Applications found : 1 ]

*  app-portage/porthole
      Latest version available: 0.6.1-r3
      Latest version installed: 0.6.1-r3
      Size of downloaded files: 936 kB
      Homepage:    http://porthole.sourceforge.net
      Description: A GTK+-based frontend to Portage
      License:     GPL-2
 

real	0m0.189s
user	0m0.149s
sys	0m0.038s
big_daddy portage # 

========================

times for -S search

========================

big_daddy portage # time /usr/bin/emerge -S porthole
!!! Repository 'vdr-devel' has sync-type attribute set to unsupported value: 'layman'
!!! Repository 'wtk' has sync-type attribute set to unsupported value: 'layman'
Searching...   / * ERROR: app-portage/c-layman-9999::gentoo-guis failed (depend phase):
 *   git.eclass could not be found by inherit()
 * 
 * Call stack:
 *              ebuild.sh, line 550:  Called source '/home/brian/Dev/git/gentoo-guis/app-portage/c-layman/c-layman-9999.ebuild'
 *   c-layman-9999.ebuild, line   9:  Called inherit 'git'
 *              ebuild.sh, line 257:  Called die
 * The specific snippet of code:
 *   		[[ -z ${location} ]] && die "${1}.eclass could not be found by inherit()"
 * 
 * If you need support, post the output of `emerge --info '=app-portage/c-layman-9999::gentoo-guis'`,
 * the complete build log and the output of `emerge -pqv '=app-portage/c-layman-9999::gentoo-guis'`.
 * Working directory: '/usr/lib64/python3.3/site-packages'
 * S: '/var/tmp/portage/app-portage/c-layman-9999/work/c-layman-9999'
emerge: search: aux_get() failed, skipping
 | * Manifest not found for '/home/brian/Dev/git/gentoo-guis/app-portage/ufed/ufed-9999.ebuild'
 | * ERROR: dev-vcs/git-bzr-9999::The-Pit failed (depend phase):
 *   git.eclass could not be found by inherit()
 * 
 * Call stack:
 *             ebuild.sh, line 550:  Called source '/usr/local/portage/dev-vcs/git-bzr/git-bzr-9999.ebuild'
 *   git-bzr-9999.ebuild, line   4:  Called inherit 'git'
 *             ebuild.sh, line 257:  Called die
 * The specific snippet of code:
 *   		[[ -z ${location} ]] && die "${1}.eclass could not be found by inherit()"
 * 
 * If you need support, post the output of `emerge --info '=dev-vcs/git-bzr-9999::The-Pit'`,
 * the complete build log and the output of `emerge -pqv '=dev-vcs/git-bzr-9999::The-Pit'`.
 * Working directory: '/usr/lib64/python3.3/site-packages'
 * S: '/var/tmp/portage/dev-vcs/git-bzr-9999/work/git-bzr-9999'
emerge: search: aux_get() failed, skipping
  
[ Results for search key : porthole ]
[ Applications found : 1 ]

*  app-portage/porthole
      Latest version available: 0.6.1-r3
      Latest version installed: 0.6.1-r3
      Size of files: 937 KiB
      Homepage:      http://porthole.sourceforge.net
      Description:   A GTK+-based frontend to Portage
      License:       GPL-2


real	1m15.121s
user	1m1.664s
sys	0m12.891s
big_daddy portage # time emerge -S porthole
!!! Repository 'vdr-devel' has sync-type attribute set to unsupported value: 'layman'
!!! Repository 'wtk' has sync-type attribute set to unsupported value: 'layman'
  
[ Results for search key : porthole ]
Searching...    
 * ERROR: app-portage/c-layman-9999::gentoo-guis failed (depend phase):
 *   git.eclass could not be found by inherit()
 * 
 * Call stack:
 *              ebuild.sh, line 575:  Called source '/home/brian/Dev/git/gentoo-guis/app-portage/c-layman/c-layman-9999.ebuild'
 *   c-layman-9999.ebuild, line   9:  Called inherit 'git'
 *              ebuild.sh, line 257:  Called die
 * The specific snippet of code:
 *   		[[ -z ${location} ]] && die "${1}.eclass could not be found by inherit()"
 * 
 * If you need support, post the output of `emerge --info '=app-portage/c-layman-9999::gentoo-guis'`,
 * the complete build log and the output of `emerge -pqv '=app-portage/c-layman-9999::gentoo-guis'`.
 * Working directory: '/home/brian/Dev/git/portage/pym'
 * S: '/var/tmp/portage/app-portage/c-layman-9999/work/c-layman-9999'
emerge: search: aux_get() failed, skipping
*  app-portage/porthole
      Latest version available: 0.6.1-r3
      Latest version installed: 0.6.1-r3
      Size of files: 937 KiB
      Homepage:      http://porthole.sourceforge.net
      Description:   A GTK+-based frontend to Portage
      License:       GPL-2

 * ERROR: dev-vcs/git-bzr-9999::The-Pit failed (depend phase):
 *   git.eclass could not be found by inherit()
 * 
 * Call stack:
 *             ebuild.sh, line 575:  Called source '/usr/local/portage/dev-vcs/git-bzr/git-bzr-9999.ebuild'
 *   git-bzr-9999.ebuild, line   4:  Called inherit 'git'
 *             ebuild.sh, line 257:  Called die
 * The specific snippet of code:
 *   		[[ -z ${location} ]] && die "${1}.eclass could not be found by inherit()"
 * 
 * If you need support, post the output of `emerge --info '=dev-vcs/git-bzr-9999::The-Pit'`,
 * the complete build log and the output of `emerge -pqv '=dev-vcs/git-bzr-9999::The-Pit'`.
 * Working directory: '/home/brian/Dev/git/portage/pym'
 * S: '/var/tmp/portage/dev-vcs/git-bzr-9999/work/git-bzr-9999'
emerge: search: aux_get() failed, skipping
[ Applications found : 1 ]


real	0m12.515s
user	0m11.795s
sys	0m0.660s
big_daddy portage # 

I know the above times are probably slowed by not having overlays indexed, but it is still a significant speedup.
esearch is only marginally slower doing a -S search than a regular pkg-name search, typically just over 0.2 seconds


The above was done with only the gentoo repo indexed, plus I need to clean out some old ebuilds in overlays.
But I was shocked to see the normal -s searches going from 3.4s to 5.5s with your new index.

Also I did not see a way to specify all repos to be index updated.  It is I believe a requirement of this new system.  Re-running is for each repo installed individually is something to be reserved for the new postsync() to do when it lands in master. 

-- 
Brian Dolbec <dolsen>

Re: [gentoo-portage-dev]

[Zac Medico]

On 11/03/2014 01:42 PM, Brian Dolbec wrote:
> I know the above times are probably slowed by not having overlays indexed, but it is still a significant speedup.
> esearch is only marginally slower doing a -S search than a regular pkg-name search, typically just over 0.2 seconds
> 
> 
> The above was done with only the gentoo repo indexed, plus I need to clean out some old ebuilds in overlays.
> But I was shocked to see the normal -s searches going from 3.4s to 5.5s with your new index.


If you update now, performance should be much better. Specifically:

1) pkg_desc_index_line_read has been optimized to skip validation
(biggest performance problem).

2) IndexedPortdb has been optimized to use a single portdbapi.cp_all
call that covers all of the unindexed repositories.

> Also I did not see a way to specify all repos to be index updated.  It is I believe a requirement of this new system.
> Re-running is for each repo installed individually is something to be
reserved for the new postsync() to do when it
> lands in master.

Yeah, I guess we may as well wait for the plugin-sync branch to get
merged first.
-- 
Thanks,
Zac