diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-30 06:05:00 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-30 06:05:00 +0000 |
| commit | 4eb58e6982d4454bd9765d1b3a7bff4e4ae5f712 (patch) | |
| tree | 0093c028d29578d8459b1b5689d7147f828852de | |
| parent | c7faa634369e61b87a40172ceb0a5cb9494fd518 (diff) | |
| download | portage-4eb58e6982d4454bd9765d1b3a7bff4e4ae5f712.tar.gz portage-4eb58e6982d4454bd9765d1b3a7bff4e4ae5f712.tar.bz2 portage-4eb58e6982d4454bd9765d1b3a7bff4e4ae5f712.zip | |
* Add more use dep validation.
* Fix broken handling of !foo? reported by ABCD.
svn path=/main/trunk/; revision=11279
| -rw-r--r-- | pym/portage/dep.py | 28 | ||||
| -rw-r--r-- | pym/portage/tests/dep/test_isvalidatom.py | 9 |
2 files changed, 28 insertions, 9 deletions
diff --git a/pym/portage/dep.py b/pym/portage/dep.py index 704a3060b..c61ac3932 100644 --- a/pym/portage/dep.py +++ b/pym/portage/dep.py @@ -347,6 +347,8 @@ class _use_dep(object): _conditionals_class = portage.cache.mappings.slot_dict_class( ("disabled", "enabled", "equal", "not_equal"), prefix="") + _valid_use_re = re.compile(r'^[^-?!=][^?!=]*$') + def __init__(self, use): enabled_flags = [] disabled_flags = [] @@ -357,25 +359,32 @@ class _use_dep(object): for x in use: last_char = x[-1:] first_char = x[:1] + second_char = x[1:2] if "?" == last_char: - if "-" == first_char: - conditional.disabled.append(x[1:-1]) + if "!" == first_char: + conditional.disabled.append( + self._validate_flag(x, x[1:-1])) else: - conditional.enabled.append(x[:-1]) + conditional.enabled.append( + self._validate_flag(x, x[:-1])) elif "=" == last_char: if "-" == first_char: raise InvalidAtom("Invalid use dep: '%s'" % (x,)) if "!" == x[-2:-1]: raise InvalidAtom("Invalid use dep: '%s'" % (x,)) if "!" == first_char: - conditional.not_equal.append(x[1:-1]) + conditional.not_equal.append( + self._validate_flag(x, x[1:-1])) else: - conditional.equal.append(x[:-1]) + conditional.equal.append( + self._validate_flag(x, x[:-1])) else: + if "!" == first_char: + raise InvalidAtom("Invalid use dep: '%s'" % (x,)) if "-" == first_char: - disabled_flags.append(x[1:]) + disabled_flags.append(self._validate_flag(x, x[1:])) else: - enabled_flags.append(x) + enabled_flags.append(self._validate_flag(x, x)) self.tokens = use if not isinstance(self.tokens, tuple): @@ -398,6 +407,11 @@ class _use_dep(object): self.conditional = conditional break + def _validate_flag(self, token, flag): + if self._valid_use_re.match(flag) is None: + raise InvalidAtom("Invalid use dep: '%s'" % (token,)) + return flag + def __nonzero__(self): return bool(self.tokens) diff --git a/pym/portage/tests/dep/test_isvalidatom.py b/pym/portage/tests/dep/test_isvalidatom.py index e21f54afc..cd501e90d 100644 --- a/pym/portage/tests/dep/test_isvalidatom.py +++ b/pym/portage/tests/dep/test_isvalidatom.py @@ -30,11 +30,16 @@ class IsValidAtom(TestCase): ( "=sys-apps/portage-2.2*:foo[!doc?]", True ), ( "=sys-apps/portage-2.2*:foo[doc=]", True ), ( "=sys-apps/portage-2.2*:foo[!doc=]", True ), + ( "=sys-apps/portage-2.2*:foo[!doc]", False ), + ( "=sys-apps/portage-2.2*:foo[!-doc]", False ), + ( "=sys-apps/portage-2.2*:foo[!-doc=]", False ), + ( "=sys-apps/portage-2.2*:foo[!-doc?]", False ), + ( "=sys-apps/portage-2.2*:foo[-doc?]", False ), ( "=sys-apps/portage-2.2*:foo[-doc=]", False ), ( "=sys-apps/portage-2.2*:foo[-doc!=]", False ), ( "=sys-apps/portage-2.2*:foo[-doc=]", False ), - ( "=sys-apps/portage-2.2*:foo[bar][-baz][doc?][-build?]", False ), - ( "=sys-apps/portage-2.2*:foo[bar,-baz,doc?,-build?]", True ), + ( "=sys-apps/portage-2.2*:foo[bar][-baz][doc?][!build?]", False ), + ( "=sys-apps/portage-2.2*:foo[bar,-baz,doc?,!build?]", True ), ( "=sys-apps/portage-2.2*:foo[bar,-baz,doc?,!build?,]", False ), ( "=sys-apps/portage-2.2*:foo[,bar,-baz,doc?,!build?]", False ), ( "=sys-apps/portage-2.2*:foo[bar,-baz][doc?,!build?]", False ), |