From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SZgcT-0005qm-4s for garchives@archives.gentoo.org; Wed, 30 May 2012 10:59:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27521E055B; Wed, 30 May 2012 10:58:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E73ABE055B for ; Wed, 30 May 2012 10:58:55 +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 40B211B4020 for ; Wed, 30 May 2012 10:58:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 03C57E5428 for ; Wed, 30 May 2012 10:58:54 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1338375271.c2cba20189488dbf0b0419dddb94176963e054e3.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/ebuild.py X-VCS-Directories: roverlay/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: c2cba20189488dbf0b0419dddb94176963e054e3 X-VCS-Branch: master Date: Wed, 30 May 2012 10:58:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 00cf58ae-d0a0-4249-8542-606df0433080 X-Archives-Hash: bd0d8a07ebeba270efaff3f8aeee36b2 commit: c2cba20189488dbf0b0419dddb94176963e054e3 Author: Andre Erdmann mailerd de> AuthorDate: Wed May 30 10:54:31 2012 +0000 Commit: Andr=C3=A9 Erdmann mailerd de> CommitDate: Wed May 30 10:54:31 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/R_overlay.git= ;a=3Dcommit;h=3Dc2cba201 roverlay, ebuild: fix list.append() / list.extend() modified: ebuild.py --- roverlay/ebuild.py | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/roverlay/ebuild.py b/roverlay/ebuild.py index 495b189..88dbde6 100644 --- a/roverlay/ebuild.py +++ b/roverlay/ebuild.py @@ -77,10 +77,13 @@ class Ebuild: raise Exception ("Ebuild data are readonly.") =20 if append and key in self._data: - if isinstance ( self._data [key], list ): + if not isinstance ( self._data [key], list ): + self._data [key] =3D [ self._data [key] ] + + if isinstance ( value, list ): self._data [key].extend ( value ) else: - self._data [key] =3D [ self._data [key] ].extend ( value ) + self._data [key].append ( value ) =20 else: self._data [key] =3D value @@ -173,11 +176,22 @@ class Ebuild: IUSE =3D [ '${IUSE:-}' ], ) =20 + tmp =3D None + if 'DEPEND' in self._data: - ret ['DEPEND'].extend ( self._data ['DEPEND'] ) + # todo: search if there is a extend method that does not split strin= g into chars + tmp =3D self._data ['DEPEND'] + if isinstance ( tmp, list ): + ret ['DEPEND'].extend ( tmp ) + else: + ret ['DEPEND'].append ( tmp ) =20 if 'RDEPEND' in self._data: - ret ['RDEPEND'].extend ( self._data ['RDEPEND'] ) + tmp =3D self._data ['RDEPEND'] + if isinstance ( tmp, list ): + ret ['RDEPEND'].extend ( tmp ) + else: + ret ['RDEPEND'].append ( tmp ) =20 if have_suggests: ret ['R_SUGGESTS'] =3D self._data ['R_SUGGESTS'] @@ -217,14 +231,14 @@ class Ebuild: if oneline_list: var_value =3D ' '.join ( value ) elif indent_list: - var_value =3D ('\n' + (indent_level + 1) * EBUILD_INDENT).join ( va= lue ) + var_value =3D ('\n' + (indent_level + 1) * Ebuild.EBUILD_INDENT).jo= in ( value ) else: '\n'.join ( value ) =20 else: var_value =3D str ( value ) =20 - return indent_level * EBUILD_INDENT + varname + '"' + value_str + '"' + return indent_level * Ebuild.EBUILD_INDENT + varname + '=3D"' + var_v= alue + '"' =20 # --- end of make_var (...) --- =20