diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-07-28 22:36:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-28 22:36:08 +0000 |
| commit | 6492998809c2eef50bbe766b3c0864d6a8dc6090 (patch) | |
| tree | 98b7ddd2aa92389527de812298e75c77e084bcba | |
| parent | Document the doman language code path translation extension from bug #222439. (diff) | |
| download | portage-idfetch-6492998809c2eef50bbe766b3c0864d6a8dc6090.tar.gz portage-idfetch-6492998809c2eef50bbe766b3c0864d6a8dc6090.tar.bz2 portage-idfetch-6492998809c2eef50bbe766b3c0864d6a8dc6090.zip | |
Tweak the conditional USE deps examples.
svn path=/main/trunk/; revision=11253
| -rw-r--r-- | doc/package/ebuild/eapi/2.docbook | 8 | ||||
| -rw-r--r-- | pym/portage/dep.py | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/doc/package/ebuild/eapi/2.docbook b/doc/package/ebuild/eapi/2.docbook index 1f3273d8..e6496288 100644 --- a/doc/package/ebuild/eapi/2.docbook +++ b/doc/package/ebuild/eapi/2.docbook @@ -48,19 +48,19 @@ <tbody> <row> <entry>foo[bar?]</entry> - <entry>foo bar? ( foo[bar] )</entry> + <entry>bar? ( foo[bar] ) !bar? ( foo )</entry> </row> <row> <entry>foo[-bar?]</entry> - <entry>foo !bar? ( foo[-bar] )</entry> + <entry>bar? ( foo ) !bar? ( foo[-bar] )</entry> </row> <row> <entry>foo[bar=]</entry> - <entry>foo bar? ( foo[bar] ) !bar? ( foo[-bar] )</entry> + <entry>bar? ( foo[bar] ) !bar? ( foo[-bar] )</entry> </row> <row> <entry>foo[bar!=]</entry> - <entry>foo bar? ( foo[-bar] ) !bar? ( foo[bar] )</entry> + <entry>bar? ( foo[-bar] ) !bar? ( foo[bar] )</entry> </row> </tbody> </tgroup> diff --git a/pym/portage/dep.py b/pym/portage/dep.py index 49f6bc04..30a63ba3 100644 --- a/pym/portage/dep.py +++ b/pym/portage/dep.py @@ -420,10 +420,10 @@ class _use_dep(object): compact form equivalent expanded form - foo[bar?] foo bar? ( foo[bar] ) - foo[-bar?] foo !bar? ( foo[-bar] ) - foo[bar=] foo bar? ( foo[bar] ) !bar? ( foo[-bar] ) - foo[bar!=] foo bar? ( foo[-bar] ) !bar? ( foo[bar] ) + foo[bar?] bar? ( foo[bar] ) !bar? ( foo ) + foo[-bar?] bar? ( foo ) !bar? ( foo[-bar] ) + foo[bar=] bar? ( foo[bar] ) !bar? ( foo[-bar] ) + foo[bar!=] bar? ( foo[-bar] ) !bar? ( foo[bar] ) """ tokens = [] |