1 |
commit: e78a13a4cce2587052b7e734fdde7e405ffb9589 |
2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
3 |
AuthorDate: Fri Jun 29 22:25:41 2012 +0000 |
4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
5 |
CommitDate: Fri Jun 29 22:25:41 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=e78a13a4 |
7 |
|
8 |
evars: applied value quoting changes |
9 |
|
10 |
modified: roverlay/ebuild/evars.py |
11 |
|
12 |
--- |
13 |
roverlay/ebuild/evars.py | 50 +++++++++++++++++++++++++++------------------ |
14 |
1 files changed, 30 insertions(+), 20 deletions(-) |
15 |
|
16 |
diff --git a/roverlay/ebuild/evars.py b/roverlay/ebuild/evars.py |
17 |
index da34c68..8900794 100644 |
18 |
--- a/roverlay/ebuild/evars.py |
19 |
+++ b/roverlay/ebuild/evars.py |
20 |
@@ -7,7 +7,9 @@ from roverlay.util import shorten_str |
21 |
from roverlay.ebuild.abstractcomponents import ListValue, EbuildVar |
22 |
|
23 |
IUSE_SUGGESTS = 'R_suggests' |
24 |
-RSUGGESTS_NAME = "R_SUGGESTS" |
25 |
+RSUGGESTS_NAME = IUSE_SUGGESTS.upper() |
26 |
+ |
27 |
+SEE_METADATA = '... (see metadata)' |
28 |
|
29 |
# ignoring case policies here (camel case,..) |
30 |
|
31 |
@@ -20,21 +22,25 @@ class DESCRIPTION ( EbuildVar ): |
32 |
* description -- description text |
33 |
* maxlen -- maximum value length (defaults to 50 chars) |
34 |
""" |
35 |
- super ( DESCRIPTION, self ) . __init__ ( 'DESCRIPTION', description, 80 ) |
36 |
+ super ( DESCRIPTION, self ) . __init__ ( |
37 |
+ name='DESCRIPTION', |
38 |
+ value=description, |
39 |
+ priority=80, param_expansion=False |
40 |
+ ) |
41 |
self.maxlen = 50 if maxlen is None else maxlen |
42 |
+ self.use_param_expansion = False |
43 |
|
44 |
- def __str__ ( self ): |
45 |
- return '%s%s="%s"' % ( |
46 |
- self.indent, |
47 |
- self.name, |
48 |
- shorten_str ( str ( self.value ) , self.maxlen, '... (see metadata)' ) |
49 |
+ def _get_value_str ( self ): |
50 |
+ return shorten_str ( |
51 |
+ str ( self.value ) , self.maxlen, SEE_METADATA |
52 |
) |
53 |
|
54 |
|
55 |
class SRC_URI ( EbuildVar ): |
56 |
"""A SRC_URI="..." statement.""" |
57 |
def __init__ ( self, src_uri ): |
58 |
- super ( SRC_URI, self ) . __init__ ( 'SRC_URI', src_uri, 90 ) |
59 |
+ super ( SRC_URI, self ) . __init__ ( |
60 |
+ name='SRC_URI', value=src_uri, priority=90, param_expansion=False ) |
61 |
|
62 |
|
63 |
class IUSE ( EbuildVar ): |
64 |
@@ -47,9 +53,10 @@ class IUSE ( EbuildVar ): |
65 |
* using_suggests -- if True: enable R_Suggests USE flag |
66 |
""" |
67 |
super ( IUSE, self ) . __init__ ( |
68 |
- 'IUSE', |
69 |
- ListValue ( use_flags, empty_value='${IUSE:-}' ), |
70 |
- 130 |
71 |
+ name='IUSE', |
72 |
+ value=ListValue ( use_flags, empty_value='${IUSE:-}' ), |
73 |
+ priority=130, |
74 |
+ param_expansion=True |
75 |
) |
76 |
self.value.single_line = True |
77 |
if using_suggests: |
78 |
@@ -60,9 +67,10 @@ class R_SUGGESTS ( EbuildVar ): |
79 |
"""A R_SUGGESTS="..." statement.""" |
80 |
def __init__ ( self, deps, **kw ): |
81 |
super ( R_SUGGESTS, self ) . __init__ ( |
82 |
- RSUGGESTS_NAME, |
83 |
- ListValue ( deps ), |
84 |
- 140 |
85 |
+ name=RSUGGESTS_NAME, |
86 |
+ value=ListValue ( deps ), |
87 |
+ priority=140, |
88 |
+ param_expansion=False |
89 |
) |
90 |
|
91 |
|
92 |
@@ -70,9 +78,10 @@ class DEPEND ( EbuildVar ): |
93 |
"""A DEPEND="..." statement.""" |
94 |
def __init__ ( self, deps, **kw ): |
95 |
super ( DEPEND, self ) . __init__ ( |
96 |
- 'DEPEND', |
97 |
- ListValue ( deps ), |
98 |
- 150 |
99 |
+ name='DEPEND', |
100 |
+ value=ListValue ( deps ), |
101 |
+ priority=150, |
102 |
+ param_expansion=False |
103 |
) |
104 |
|
105 |
|
106 |
@@ -80,9 +89,10 @@ class RDEPEND ( EbuildVar ): |
107 |
"""A RDEPEND="..." statement.""" |
108 |
def __init__ ( self, deps, using_suggests=False, **kw ): |
109 |
super ( RDEPEND, self ) . __init__ ( |
110 |
- 'RDEPEND', |
111 |
- ListValue ( deps, empty_value="${DEPEND:-}" ), |
112 |
- 160 |
113 |
+ name='RDEPEND', |
114 |
+ value=ListValue ( deps, empty_value="${DEPEND:-}" ), |
115 |
+ priority=160, |
116 |
+ param_expansion=True |
117 |
) |
118 |
if using_suggests: self.enable_suggests() |