Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r11281 - main/trunk/pym/portage
Date: Wed, 30 Jul 2008 06:12:23
Message-Id: E1KO4v6-000378-Ia@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-07-30 06:12:19 +0000 (Wed, 30 Jul 2008)
3 New Revision: 11281
4
5 Modified:
6 main/trunk/pym/portage/dep.py
7 Log:
8 Remove redundant use dep validation code that's handled by regular expression
9 now.
10
11
12 Modified: main/trunk/pym/portage/dep.py
13 ===================================================================
14 --- main/trunk/pym/portage/dep.py 2008-07-30 06:07:55 UTC (rev 11280)
15 +++ main/trunk/pym/portage/dep.py 2008-07-30 06:12:19 UTC (rev 11281)
16 @@ -367,20 +367,16 @@
17 else:
18 conditional.enabled.append(
19 self._validate_flag(x, x[:-1]))
20 +
21 elif "=" == last_char:
22 - if "-" == first_char:
23 - raise InvalidAtom("Invalid use dep: '%s'" % (x,))
24 - if "!" == x[-2:-1]:
25 - raise InvalidAtom("Invalid use dep: '%s'" % (x,))
26 if "!" == first_char:
27 conditional.not_equal.append(
28 self._validate_flag(x, x[1:-1]))
29 else:
30 conditional.equal.append(
31 self._validate_flag(x, x[:-1]))
32 +
33 else:
34 - if "!" == first_char:
35 - raise InvalidAtom("Invalid use dep: '%s'" % (x,))
36 if "-" == first_char:
37 disabled_flags.append(self._validate_flag(x, x[1:]))
38 else: