| 1 |
Author: zmedico |
| 2 |
Date: 2008-07-30 02:27:53 +0000 (Wed, 30 Jul 2008) |
| 3 |
New Revision: 11274 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/doc/package/ebuild/eapi/2.docbook |
| 7 |
main/trunk/pym/portage/__init__.py |
| 8 |
main/trunk/pym/portage/dep.py |
| 9 |
main/trunk/pym/portage/tests/__init__.py |
| 10 |
main/trunk/pym/portage/tests/dep/test_isvalidatom.py |
| 11 |
Log: |
| 12 |
Change conditional USE deps syntax and expermental EAPI from 2_pre0 to 2_pre1. |
| 13 |
|
| 14 |
Conditional syntax examples: |
| 15 |
|
| 16 |
Compact Form Equivalent Expanded Form |
| 17 |
|
| 18 |
foo[bar?] bar? ( foo[bar] ) !bar? ( foo ) |
| 19 |
foo[!bar?] bar? ( foo ) !bar? ( foo[-bar] ) |
| 20 |
foo[bar=] bar? ( foo[bar] ) !bar? ( foo[-bar] ) |
| 21 |
foo[!bar=] bar? ( foo[-bar] ) !bar? ( foo[bar] ) |
| 22 |
|
| 23 |
|
| 24 |
|
| 25 |
Modified: main/trunk/doc/package/ebuild/eapi/2.docbook |
| 26 |
=================================================================== |
| 27 |
--- main/trunk/doc/package/ebuild/eapi/2.docbook 2008-07-29 21:27:59 UTC (rev 11273) |
| 28 |
+++ main/trunk/doc/package/ebuild/eapi/2.docbook 2008-07-30 02:27:53 UTC (rev 11274) |
| 29 |
@@ -1,5 +1,5 @@ |
| 30 |
<sect1 id='package-ebuild-eapi-2'> |
| 31 |
- <title>EAPI 2_pre0</title> |
| 32 |
+ <title>EAPI 2_pre1</title> |
| 33 |
<sect2 id='package-ebuild-eapi-2-helpers'> |
| 34 |
<title>Helpers</title> |
| 35 |
<sect3 id='package-ebuild-eapi-2-helpers-doman'> |
| 36 |
@@ -80,7 +80,7 @@ |
| 37 |
<entry>bar? ( foo[bar] ) !bar? ( foo )</entry> |
| 38 |
</row> |
| 39 |
<row> |
| 40 |
- <entry>foo[-bar?]</entry> |
| 41 |
+ <entry>foo[!bar?]</entry> |
| 42 |
<entry>bar? ( foo ) !bar? ( foo[-bar] )</entry> |
| 43 |
</row> |
| 44 |
<row> |
| 45 |
@@ -89,7 +89,7 @@ |
| 46 |
</row> |
| 47 |
<row> |
| 48 |
<entry>foo[bar!=]</entry> |
| 49 |
- <entry>bar? ( foo[-bar] ) !bar? ( foo[bar] )</entry> |
| 50 |
+ <entry>bar? ( foo[-bar] ) !bar? ( foo[bar] )</entry> |
| 51 |
</row> |
| 52 |
</tbody> |
| 53 |
</tgroup> |
| 54 |
|
| 55 |
Modified: main/trunk/pym/portage/__init__.py |
| 56 |
=================================================================== |
| 57 |
--- main/trunk/pym/portage/__init__.py 2008-07-29 21:27:59 UTC (rev 11273) |
| 58 |
+++ main/trunk/pym/portage/__init__.py 2008-07-30 02:27:53 UTC (rev 11274) |
| 59 |
@@ -4478,7 +4478,7 @@ |
| 60 |
|
| 61 |
def eapi_is_supported(eapi): |
| 62 |
eapi = str(eapi).strip() |
| 63 |
- if eapi == "2_pre0": |
| 64 |
+ if eapi == "2_pre1": |
| 65 |
return True |
| 66 |
try: |
| 67 |
eapi = int(eapi) |
| 68 |
|
| 69 |
Modified: main/trunk/pym/portage/dep.py |
| 70 |
=================================================================== |
| 71 |
--- main/trunk/pym/portage/dep.py 2008-07-29 21:27:59 UTC (rev 11273) |
| 72 |
+++ main/trunk/pym/portage/dep.py 2008-07-30 02:27:53 UTC (rev 11274) |
| 73 |
@@ -356,20 +356,23 @@ |
| 74 |
|
| 75 |
for x in use: |
| 76 |
last_char = x[-1:] |
| 77 |
+ first_char = x[:1] |
| 78 |
if "?" == last_char: |
| 79 |
- if "-" == x[:1]: |
| 80 |
+ if "-" == first_char: |
| 81 |
conditional.disabled.append(x[1:-1]) |
| 82 |
else: |
| 83 |
conditional.enabled.append(x[:-1]) |
| 84 |
elif "=" == last_char: |
| 85 |
- if "-" == x[:1]: |
| 86 |
+ if "-" == first_char: |
| 87 |
raise InvalidAtom("Invalid use dep: '%s'" % (x,)) |
| 88 |
if "!" == x[-2:-1]: |
| 89 |
- conditional.not_equal.append(x[:-2]) |
| 90 |
+ raise InvalidAtom("Invalid use dep: '%s'" % (x,)) |
| 91 |
+ if "!" == first_char: |
| 92 |
+ conditional.not_equal.append(x[1:-1]) |
| 93 |
else: |
| 94 |
conditional.equal.append(x[:-1]) |
| 95 |
else: |
| 96 |
- if "-" == x[:1]: |
| 97 |
+ if "-" == first_char: |
| 98 |
disabled_flags.append(x[1:]) |
| 99 |
else: |
| 100 |
enabled_flags.append(x) |
| 101 |
@@ -413,22 +416,22 @@ |
| 102 |
|
| 103 |
x x? x |
| 104 |
-x x? |
| 105 |
- x -x? |
| 106 |
- -x -x? -x |
| 107 |
+ x !x? |
| 108 |
+ -x !x? -x |
| 109 |
|
| 110 |
x x= x |
| 111 |
-x x= -x |
| 112 |
- x x!= -x |
| 113 |
- -x x!= x |
| 114 |
+ x !x= -x |
| 115 |
+ -x !x= x |
| 116 |
|
| 117 |
Conditional syntax examples: |
| 118 |
|
| 119 |
- compact form equivalent expanded form |
| 120 |
+ Compact Form Equivalent Expanded Form |
| 121 |
|
| 122 |
foo[bar?] bar? ( foo[bar] ) !bar? ( foo ) |
| 123 |
- foo[-bar?] bar? ( foo ) !bar? ( foo[-bar] ) |
| 124 |
+ foo[!bar?] bar? ( foo ) !bar? ( foo[-bar] ) |
| 125 |
foo[bar=] bar? ( foo[bar] ) !bar? ( foo[-bar] ) |
| 126 |
- foo[bar!=] bar? ( foo[-bar] ) !bar? ( foo[bar] ) |
| 127 |
+ foo[!bar=] bar? ( foo[-bar] ) !bar? ( foo[bar] ) |
| 128 |
|
| 129 |
""" |
| 130 |
tokens = [] |
| 131 |
|
| 132 |
Modified: main/trunk/pym/portage/tests/__init__.py |
| 133 |
=================================================================== |
| 134 |
--- main/trunk/pym/portage/tests/__init__.py 2008-07-29 21:27:59 UTC (rev 11273) |
| 135 |
+++ main/trunk/pym/portage/tests/__init__.py 2008-07-30 02:27:53 UTC (rev 11274) |
| 136 |
@@ -178,4 +178,4 @@ |
| 137 |
test_versions = ['1.0', '1.0-r1','2.3_p4','1.0_alpha57'] |
| 138 |
test_slots = [ None, '1','gentoo-sources-2.6.17','spankywashere'] |
| 139 |
test_usedeps = ['foo','-bar', ('foo','bar'), |
| 140 |
- ('foo','-bar'), ('foo?', '-bar?') ] |
| 141 |
+ ('foo','-bar'), ('foo?', '!bar?') ] |
| 142 |
|
| 143 |
Modified: main/trunk/pym/portage/tests/dep/test_isvalidatom.py |
| 144 |
=================================================================== |
| 145 |
--- main/trunk/pym/portage/tests/dep/test_isvalidatom.py 2008-07-29 21:27:59 UTC (rev 11273) |
| 146 |
+++ main/trunk/pym/portage/tests/dep/test_isvalidatom.py 2008-07-30 02:27:53 UTC (rev 11274) |
| 147 |
@@ -25,16 +25,19 @@ |
| 148 |
( "sys-apps/portage:foo", True ), |
| 149 |
( "sys-apps/portage-2.1:foo", False ), |
| 150 |
( "sys-apps/portage-2.1:", False ), |
| 151 |
- ( "=sys-apps/portage-2.2*:foo[bar?,-baz?,doc!=,build=]", True ), |
| 152 |
- ( "=sys-apps/portage-2.2*:foo[build=]", True ), |
| 153 |
- ( "=sys-apps/portage-2.2*:foo[doc!=]", True ), |
| 154 |
+ ( "=sys-apps/portage-2.2*:foo[bar?,!baz?,!doc=,build=]", True ), |
| 155 |
+ ( "=sys-apps/portage-2.2*:foo[doc?]", True ), |
| 156 |
+ ( "=sys-apps/portage-2.2*:foo[!doc?]", True ), |
| 157 |
+ ( "=sys-apps/portage-2.2*:foo[doc=]", True ), |
| 158 |
+ ( "=sys-apps/portage-2.2*:foo[!doc=]", True ), |
| 159 |
+ ( "=sys-apps/portage-2.2*:foo[-doc=]", False ), |
| 160 |
( "=sys-apps/portage-2.2*:foo[-doc!=]", False ), |
| 161 |
( "=sys-apps/portage-2.2*:foo[-doc=]", False ), |
| 162 |
( "=sys-apps/portage-2.2*:foo[bar][-baz][doc?][-build?]", False ), |
| 163 |
( "=sys-apps/portage-2.2*:foo[bar,-baz,doc?,-build?]", True ), |
| 164 |
- ( "=sys-apps/portage-2.2*:foo[bar,-baz,doc?,-build?,]", False ), |
| 165 |
- ( "=sys-apps/portage-2.2*:foo[,bar,-baz,doc?,-build?]", False ), |
| 166 |
- ( "=sys-apps/portage-2.2*:foo[bar,-baz][doc?,-build?]", False ), |
| 167 |
+ ( "=sys-apps/portage-2.2*:foo[bar,-baz,doc?,!build?,]", False ), |
| 168 |
+ ( "=sys-apps/portage-2.2*:foo[,bar,-baz,doc?,!build?]", False ), |
| 169 |
+ ( "=sys-apps/portage-2.2*:foo[bar,-baz][doc?,!build?]", False ), |
| 170 |
( "=sys-apps/portage-2.2*:foo[bar][doc,build]", False ), |
| 171 |
( ">~cate-gory/foo-1.0", False ), |
| 172 |
( ">~category/foo-1.0", False ), |
Archives