From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 83EF013800E for ; Thu, 2 Aug 2012 15:14:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44701E072C; Thu, 2 Aug 2012 15:14:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 16E36E0716 for ; Thu, 2 Aug 2012 15:14:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 617D21B403E for ; Thu, 2 Aug 2012 15:14:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 123B5E5458 for ; Thu, 2 Aug 2012 15:14:18 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1343919829.6ec1d67b85fd8c5058f360ab1bdbbff332f973fa.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/ebuild/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/ebuild/abstractcomponents.py roverlay/ebuild/evars.py X-VCS-Directories: roverlay/ebuild/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 6ec1d67b85fd8c5058f360ab1bdbbff332f973fa X-VCS-Branch: master Date: Thu, 2 Aug 2012 15:14:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a4d7b30c-32ac-48b4-a0d0-432fa16f7e91 X-Archives-Hash: 04ca8715162d596834751a0fd7d2ba35 commit: 6ec1d67b85fd8c5058f360ab1bdbbff332f973fa Author: André Erdmann mailerd de> AuthorDate: Thu Aug 2 15:03:49 2012 +0000 Commit: André Erdmann mailerd de> CommitDate: Thu Aug 2 15:03:49 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=6ec1d67b ebuild: comments, string formatting and strutil --- roverlay/ebuild/abstractcomponents.py | 6 ++++-- roverlay/ebuild/evars.py | 10 +++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/roverlay/ebuild/abstractcomponents.py b/roverlay/ebuild/abstractcomponents.py index 6fbc959..5326a8e 100644 --- a/roverlay/ebuild/abstractcomponents.py +++ b/roverlay/ebuild/abstractcomponents.py @@ -176,11 +176,13 @@ class EbuildVar ( object ): def __str__ ( self ): valstr = self._quote_value() if len ( valstr ) > 2 or self.print_empty_var: - return '%s%s=%s' % ( self.indent, self.name, valstr ) + return "{indent}{name}={value}".format ( + indent=self.indent, name=self.name, value=valstr + ) else: # empty string 'cause var is not set # -> Ebuilder ignores this var # this filters out the result of strip(QUOTE_CHARS) for values that # contain only quote chars - return "" + return self._empty_str() if hasattr ( self, '_empty_str' ) else "" # --- end of __str__ (...) --- diff --git a/roverlay/ebuild/evars.py b/roverlay/ebuild/evars.py index 0e295aa..2a7692d 100644 --- a/roverlay/ebuild/evars.py +++ b/roverlay/ebuild/evars.py @@ -2,7 +2,7 @@ # Copyright 2006-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from roverlay import util +from roverlay import strutil from roverlay.ebuild.abstractcomponents import ListValue, EbuildVar @@ -31,8 +31,8 @@ class DESCRIPTION ( EbuildVar ): self.use_param_expansion = False def _get_value_str ( self ): - return util.shorten_str ( - util.ascii_filter ( str ( self.value ) ), self.maxlen, SEE_METADATA + return strutil.shorten_str ( + strutil.ascii_filter ( str ( self.value ) ), self.maxlen, SEE_METADATA ) @@ -42,6 +42,10 @@ class SRC_URI ( EbuildVar ): super ( SRC_URI, self ) . __init__ ( name='SRC_URI', value=src_uri, priority=90, param_expansion=False ) + def _empty_str ( self ): + """Called if this SRC_URI evar has no uri stored.""" + return 'SRC_URI=""\nRESTRICT="fetch"' + class IUSE ( EbuildVar ): """An IUSE="..." statement."""