From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gentoopm:master commit in: gentoopm/basepm/
Date: Tue, 26 Jul 2011 07:24:10 +0000 (UTC) [thread overview]
Message-ID: <e21be5ccba638ae1588d181db23f0e8380a5836d.mgorny@gentoo> (raw)
commit: e21be5ccba638ae1588d181db23f0e8380a5836d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 07:12:30 2011 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 07:12:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=e21be5cc
Support removing conditionals from depsets.
---
gentoopm/basepm/depend.py | 49 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/gentoopm/basepm/depend.py b/gentoopm/basepm/depend.py
index 78e5c02..e504594 100644
--- a/gentoopm/basepm/depend.py
+++ b/gentoopm/basepm/depend.py
@@ -21,11 +21,46 @@ class PMBaseDep(ABCObject):
"""
pass
+ @abstractproperty
+ def without_conditionals(self):
+ """
+ Return the depspec with all conditionals resolved.
+
+ @type: L{PMUncondDep}
+ """
+ pass
+
+class PMUncondDep(PMBaseDep):
+ def __init__(self, parent):
+ self._parent = parent
+
+ @property
+ def without_conditionals(self):
+ return self
+
+ def _iter_deps(self, deps):
+ for d in deps:
+ if isinstance(d, PMConditionalDep):
+ if d.enabled:
+ for d in self._iter_deps(d):
+ yield d
+ elif isinstance(d, PMOneOfDep):
+ yield PMUncondOneOfDep(d)
+ else:
+ yield d
+
+ def __iter__(self):
+ return self._iter_deps(self._parent)
+
class PMConditionalDep(PMBaseDep):
"""
A conditional dependency set (enabled by a condition of some kind).
"""
+ @property
+ def without_conditionals(self):
+ return PMUncondDep((self,))
+
@abstractproperty
def enabled(self):
"""
@@ -36,10 +71,22 @@ class PMConditionalDep(PMBaseDep):
pass
class PMOneOfDep(PMBaseDep):
+ """
+ A one-of dependency set (C{|| ( ... )}).
+ """
+
+ @property
+ def without_conditionals(self):
+ return PMUncondOneOfDep(self)
+
+class PMUncondOneOfDep(PMOneOfDep, PMUncondDep):
pass
class PMPackageDepSet(PMBaseDep):
"""
A base class representing a depset of a single package.
"""
- pass
+
+ @property
+ def without_conditionals(self):
+ return PMUncondDep(self)
next reply other threads:[~2011-07-26 7:24 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-26 7:24 Michał Górny [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-08-07 9:18 [gentoo-commits] proj/gentoopm:master commit in: gentoopm/basepm/ Michał Górny
2013-08-05 16:04 Michał Górny
2011-12-24 9:18 Michał Górny
2011-09-10 8:28 Michał Górny
2011-08-15 8:48 Michał Górny
2011-08-15 8:48 Michał Górny
2011-08-15 7:57 Michał Górny
2011-08-13 9:17 Michał Górny
2011-08-12 20:38 Michał Górny
2011-08-12 17:43 Michał Górny
2011-07-28 16:24 Michał Górny
2011-07-26 20:10 Michał Górny
2011-07-26 20:10 Michał Górny
2011-07-26 16:36 Michał Górny
2011-07-25 17:33 Michał Górny
2011-07-25 17:33 Michał Górny
2011-07-25 17:06 Michał Górny
2011-07-24 20:05 Michał Górny
2011-07-23 9:27 Michał Górny
2011-07-23 9:27 Michał Górny
2011-07-21 8:47 Michał Górny
2011-07-20 9:41 Michał Górny
2011-07-17 22:39 Michał Górny
2011-07-17 22:10 Michał Górny
2011-07-17 22:10 Michał Górny
2011-07-17 22:10 Michał Górny
2011-07-17 9:09 Michał Górny
2011-07-15 23:56 Michał Górny
2011-07-15 23:56 Michał Górny
2011-07-15 22:24 Michał Górny
2011-07-15 22:24 Michał Górny
2011-07-15 22:24 Michał Górny
2011-07-15 13:32 Michał Górny
2011-07-15 12:34 Michał Górny
2011-07-15 12:34 Michał Górny
2011-07-15 12:34 Michał Górny
2011-07-15 9:52 Michał Górny
2011-07-15 9:52 Michał Górny
2011-07-14 22:51 Michał Górny
2011-07-14 13:31 Michał Górny
2011-07-14 13:31 Michał Górny
2011-07-14 13:31 Michał Górny
2011-07-13 16:30 Michał Górny
2011-07-13 16:09 Michał Górny
2011-07-11 9:39 Michał Górny
2011-07-11 9:39 Michał Górny
2011-07-10 12:34 Michał Górny
2011-07-08 12:49 Michał Górny
2011-07-08 12:49 Michał Górny
2011-07-07 12:52 Michał Górny
2011-07-07 12:52 Michał Górny
2011-07-07 12:52 Michał Górny
2011-07-07 9:51 Michał Górny
2011-07-06 20:54 Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e21be5ccba638ae1588d181db23f0e8380a5836d.mgorny@gentoo \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox