Re: [gentoo-portage-dev] [PATCH] Mention sourced files syntax
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Please stop CCing me. - -- Alexander alexan...@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/ iF4EAREIAAYFAlKdfyYACgkQRtClrXBQc7WQOwEAoiQiHJgym5kxQZz0pmUduNN7 h1ZSv7ZlPANYs2btdUsBAJzSM4k6xquBblb+/oTWmqovIhziShOyx1XbhvIxuJT6 =WsPk -END PGP SIGNATURE-
[gentoo-portage-dev] [PATCH] Fix crash in _ignore_dependency
From: Sebastian Luther --- pym/_emerge/depgraph.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 67b8881..763f3fd 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2337,6 +2337,7 @@ class depgraph(object): (pkg.root, pkg.slot_atom) in self._dynamic_config._slot_operator_replace_installed and \ mypriority.satisfied is not child and \ mypriority.satisfied.installed and \ + child and \ not child.installed and \ (child.slot != mypriority.satisfied.slot or child.sub_slot != mypriority.satisfied.sub_slot): slot_operator_rebuild = True -- 1.8.3.2
Re: [gentoo-portage-dev] [PATCH] Mention sourced files syntax
On Monday 02 December 2013 05:22:06 Brian Dolbec wrote: > On Mon, 2013-12-02 at 01:52 -0500, Mike Frysinger wrote: > > On Sunday 01 December 2013 19:08:26 Alexander Berntsen wrote: > > > I sat down to fix bug #492314, but Sebastian already did. Here's the > > > man update I did for it though. (Couldn't find anyone with commit > > > rights available on IRC right now, and I'm soon going to bed, so > > > posting here.) > > > > looks like Brian merged it. for future patches, please use `git > > send-email` rather than attaching as it makes it a lot easier to review. > > But it was a hell of a lot easier to apply. It was easy to view inline > in evolution. Evolution seems to screw up the inline patches. I had to > wget Sebastians raw email from gmane in order to be able to apply it. that makes no sense. in evolution, you should just be able to save the e-mail as a raw mbox and then apply that. that's how every e-mail client i've used does it. > I prefer being able to pull from an online repo. review should happen on the list where everyone else is watching -mike signature.asc Description: This is a digitally signed message part.
Re: [gentoo-portage-dev] [PATCH] Further document repos.conf
2013-12-02 01:28 Alexander Berntsen napisał(a):
> Another trivial one. "Fixes" bug #491426.
Wrong section ("/etc/portage/make.profile/ or /etc/make.profile/" instead of
"/etc/portage/"). I will fix it.
When changing a manual, please remember to update date in first line in manual.
--
Arfrever Frehtes Taifersar Arahesis
signature.asc
Description: This is a digitally signed message part.
Re: [gentoo-portage-dev] [PATCH] Fix unnecessary rebuild (bug 487198)
Whoever commits this: Please give the test case a better name like testSlotConflictMixedDependencies.
[gentoo-portage-dev] [PATCH] Fix unnecessary rebuild (bug 487198)
From: Sebastian Luther
This one was caused by a mix of >= and < dependencies.
---
pym/_emerge/depgraph.py| 92 +-
.../tests/resolver/test_slot_conflict_rebuild.py | 66
2 files changed, 139 insertions(+), 19 deletions(-)
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index cd68db6..67b8881 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1298,7 +1298,34 @@ class depgraph(object):
selected_atoms = None
- for atom in replacement_parent.validated_atoms:
+ atoms = set()
+ invalid_metadata = False
+ for dep_key in ("DEPEND", "HDEPEND", "RDEPEND",
"PDEPEND"):
+ dep_string =
replacement_parent._metadata[dep_key]
+ if not dep_string:
+ continue
+
+ try:
+ dep_string =
portage.dep.use_reduce(dep_string,
+
uselist=self._pkg_use_enabled(replacement_parent),
+
is_valid_flag=replacement_parent.iuse.is_valid_flag,
+ flat=True, token_class=Atom,
+ eapi=replacement_parent.eapi)
+ except portage.exception.InvalidDependString:
+ invalid_metadata = True
+ break
+
+ atoms.update(token for token in dep_string if
isinstance(token, Atom))
+
+ if invalid_metadata:
+ continue
+
+ # List of list of child,atom pairs for each atom.
+ replacement_candidates = []
+ # Set of all packages all atoms can agree on.
+ all_candidate_pkgs = None
+
+ for atom in atoms:
if atom.blocker or \
atom.cp != dep.atom.cp:
continue
@@ -1316,6 +1343,8 @@ class depgraph(object):
# parent and search for another.
break
+ candidate_pkg_atoms = []
+ candidate_pkgs = []
for pkg in self._iter_similar_available(
dep.child, atom):
if pkg.slot == dep.child.slot and \
@@ -1367,26 +1396,51 @@ class depgraph(object):
if unevaluated_atom not in
selected_atoms:
continue
- if debug:
- msg = []
- msg.append("")
- msg.append("")
-
msg.append("slot_operator_update_probe:")
- msg.append(" existing child
package: %s" % dep.child)
- msg.append(" existing parent
package: %s" % dep.parent)
- msg.append(" new child
package: %s" % pkg)
- msg.append(" new parent
package: %s" % replacement_parent)
- if insignificant:
-
msg.append("insignificant changes detected")
- msg.append("")
- writemsg_level("\n".join(msg),
- noiselevel=-1,
level=logging.DEBUG)
+ if not insignificant:
+
candidate_pkg_atoms.append((pkg, unevaluated_atom))
+ candidate_pkgs.append(pkg)
+
+
replacement_candidates.append(candidate_pkg_atoms)
+ if all_candidate_pkgs is None:
+ all_candidate_pkgs = set(candidate_pkgs)
+ else:
+
all_candidate_pkgs.intersection_update(candidate_pkgs)
+
+ if not all_candidate_pkgs:
+ # If the atoms that connect parent and child
can't agree on
+ # any replacement child, we can't do anything.
+ continue
Re: [gentoo-portage-dev] [PATCH] Mention sourced files syntax
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 For future reference: please stop CCing me. - -- Alexander alexan...@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/ iF4EAREIAAYFAlKcczsACgkQRtClrXBQc7WNfwEAtNF6n0KnN1v3g/CBMuzC+4LN TiBInF1K5tyNkex9dPkBAKF+XodHXAo41oPI3hcvz3oTAuXljgm0p4v/jEsadjLo =5E8Y -END PGP SIGNATURE-
Re: [gentoo-portage-dev] [PATCH] Mention sourced files syntax
On Mon, 2013-12-02 at 01:52 -0500, Mike Frysinger wrote: > On Sunday 01 December 2013 19:08:26 Alexander Berntsen wrote: > > I sat down to fix bug #492314, but Sebastian already did. Here's the > > man update I did for it though. (Couldn't find anyone with commit > > rights available on IRC right now, and I'm soon going to bed, so > > posting here.) > > looks like Brian merged it. for future patches, please use `git send-email` > rather than attaching as it makes it a lot easier to review. > -mike But it was a hell of a lot easier to apply. It was easy to view inline in evolution. Evolution seems to screw up the inline patches. I had to wget Sebastians raw email from gmane in order to be able to apply it. I prefer being able to pull from an online repo. signature.asc Description: This is a digitally signed message part
