| 1 |
commit: 6ec1d67b85fd8c5058f360ab1bdbbff332f973fa |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Thu Aug 2 15:03:49 2012 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Thu Aug 2 15:03:49 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=6ec1d67b |
| 7 |
|
| 8 |
ebuild: comments, string formatting and strutil |
| 9 |
|
| 10 |
--- |
| 11 |
roverlay/ebuild/abstractcomponents.py | 6 ++++-- |
| 12 |
roverlay/ebuild/evars.py | 10 +++++++--- |
| 13 |
2 files changed, 11 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/roverlay/ebuild/abstractcomponents.py b/roverlay/ebuild/abstractcomponents.py |
| 16 |
index 6fbc959..5326a8e 100644 |
| 17 |
--- a/roverlay/ebuild/abstractcomponents.py |
| 18 |
+++ b/roverlay/ebuild/abstractcomponents.py |
| 19 |
@@ -176,11 +176,13 @@ class EbuildVar ( object ): |
| 20 |
def __str__ ( self ): |
| 21 |
valstr = self._quote_value() |
| 22 |
if len ( valstr ) > 2 or self.print_empty_var: |
| 23 |
- return '%s%s=%s' % ( self.indent, self.name, valstr ) |
| 24 |
+ return "{indent}{name}={value}".format ( |
| 25 |
+ indent=self.indent, name=self.name, value=valstr |
| 26 |
+ ) |
| 27 |
else: |
| 28 |
# empty string 'cause var is not set |
| 29 |
# -> Ebuilder ignores this var |
| 30 |
# this filters out the result of strip(QUOTE_CHARS) for values that |
| 31 |
# contain only quote chars |
| 32 |
- return "" |
| 33 |
+ return self._empty_str() if hasattr ( self, '_empty_str' ) else "" |
| 34 |
# --- end of __str__ (...) --- |
| 35 |
|
| 36 |
diff --git a/roverlay/ebuild/evars.py b/roverlay/ebuild/evars.py |
| 37 |
index 0e295aa..2a7692d 100644 |
| 38 |
--- a/roverlay/ebuild/evars.py |
| 39 |
+++ b/roverlay/ebuild/evars.py |
| 40 |
@@ -2,7 +2,7 @@ |
| 41 |
# Copyright 2006-2012 Gentoo Foundation |
| 42 |
# Distributed under the terms of the GNU General Public License v2 |
| 43 |
|
| 44 |
-from roverlay import util |
| 45 |
+from roverlay import strutil |
| 46 |
|
| 47 |
from roverlay.ebuild.abstractcomponents import ListValue, EbuildVar |
| 48 |
|
| 49 |
@@ -31,8 +31,8 @@ class DESCRIPTION ( EbuildVar ): |
| 50 |
self.use_param_expansion = False |
| 51 |
|
| 52 |
def _get_value_str ( self ): |
| 53 |
- return util.shorten_str ( |
| 54 |
- util.ascii_filter ( str ( self.value ) ), self.maxlen, SEE_METADATA |
| 55 |
+ return strutil.shorten_str ( |
| 56 |
+ strutil.ascii_filter ( str ( self.value ) ), self.maxlen, SEE_METADATA |
| 57 |
) |
| 58 |
|
| 59 |
|
| 60 |
@@ -42,6 +42,10 @@ class SRC_URI ( EbuildVar ): |
| 61 |
super ( SRC_URI, self ) . __init__ ( |
| 62 |
name='SRC_URI', value=src_uri, priority=90, param_expansion=False ) |
| 63 |
|
| 64 |
+ def _empty_str ( self ): |
| 65 |
+ """Called if this SRC_URI evar has no uri stored.""" |
| 66 |
+ return 'SRC_URI=""\nRESTRICT="fetch"' |
| 67 |
+ |
| 68 |
|
| 69 |
class IUSE ( EbuildVar ): |
| 70 |
"""An IUSE="..." statement.""" |
Archives