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.77) (envelope-from ) id 1SqnyC-0000wd-Ab for garchives@archives.gentoo.org; Mon, 16 Jul 2012 16:16:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36414E0767; Mon, 16 Jul 2012 16:15:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0C305E0767 for ; Mon, 16 Jul 2012 16:15:46 +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 5B7B01B4092 for ; Mon, 16 Jul 2012 16:15:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 10575E543D for ; Mon, 16 Jul 2012 16:15:45 +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: <1342437440.f5e0ea775cc86046fc424a2c63e9709670a4fe6d.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:depres_wip commit in: roverlay/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/packageinfo.py roverlay/util.py X-VCS-Directories: roverlay/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: f5e0ea775cc86046fc424a2c63e9709670a4fe6d X-VCS-Branch: depres_wip Date: Mon, 16 Jul 2012 16:15:45 +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: ddb0fc9f-ce73-4890-be51-dc8aa319e7a4 X-Archives-Hash: 82a68bc85962bf676d952e519cd9446b commit: f5e0ea775cc86046fc424a2c63e9709670a4fe6d Author: Andr=C3=A9 Erdmann mailerd de> AuthorDate: Mon Jul 16 11:17:20 2012 +0000 Commit: Andr=C3=A9 Erdmann mailerd de> CommitDate: Mon Jul 16 11:17:20 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/R_overlay.git= ;a=3Dcommit;h=3Df5e0ea77 move fix_ebuild_name to util --- roverlay/packageinfo.py | 9 ++------- roverlay/util.py | 10 ++++++++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/roverlay/packageinfo.py b/roverlay/packageinfo.py index cc09a6b..052fad7 100644 --- a/roverlay/packageinfo.py +++ b/roverlay/packageinfo.py @@ -41,10 +41,6 @@ class PackageInfo ( object ): config.get_or_fail ( 'R_PACKAGE.suffix_regex' ) + '$' ) =20 - ILLEGAL_NAME_CHARS =3D re.compile ( "[.:]{1,}" ) - ILLEGAL_NAME_CHARS_REPLACE_BY =3D '_' - - def __init__ ( self, **initial_info ): """Initializes a PackageInfo. =20 @@ -308,9 +304,8 @@ class PackageInfo ( object ): # using pkg_version for the ebuild version =20 # removing illegal chars from the package_name - ebuild_name =3D PackageInfo.ILLEGAL_NAME_CHARS.sub ( - PackageInfo.ILLEGAL_NAME_CHARS_REPLACE_BY, package_name - ) + ebuild_name =3D util.fix_ebuild_name ( package_name ) + if ebuild_name !=3D package_name: self ['name'] =3D ebuild_name =20 diff --git a/roverlay/util.py b/roverlay/util.py index f66532a..d658b15 100644 --- a/roverlay/util.py +++ b/roverlay/util.py @@ -11,6 +11,16 @@ from roverlay import config =20 LOGGER =3D logging.getLogger ( 'util' ) =20 +_EBUILD_NAME_ILLEGAL_CHARS =3D re.compile ( "[.:]{1,}" ) +_EBUILD_NAME_ILLEGAL_CHARS_REPLACE_BY =3D '_' + +def fix_ebuild_name ( name ): + return _EBUILD_NAME_ILLEGAL_CHARS.sub ( + _EBUILD_NAME_ILLEGAL_CHARS_REPLACE_BY, + name + ) +# --- end of fix_ebuild_name (...) --- + def shorten_str ( s, maxlen, replace_end=3DNone ): if not replace_end is None: rlen =3D maxlen - len ( replace_end ) 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.77) (envelope-from ) id 1Sqnz8-0001Ai-Qf for garchives@archives.gentoo.org; Mon, 16 Jul 2012 16:17:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD017E077F; Mon, 16 Jul 2012 16:15:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8F3FEE0783 for ; Mon, 16 Jul 2012 16:15:50 +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 D6B361B4092 for ; Mon, 16 Jul 2012 16:15:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2505BE5450 for ; Mon, 16 Jul 2012 16:15:47 +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: <1342437440.f5e0ea775cc86046fc424a2c63e9709670a4fe6d.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/packageinfo.py roverlay/util.py X-VCS-Directories: roverlay/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: f5e0ea775cc86046fc424a2c63e9709670a4fe6d X-VCS-Branch: master Date: Mon, 16 Jul 2012 16:15:47 +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: dd723ed6-34c6-4e04-8867-1cb119609ae3 X-Archives-Hash: 55d8c0c4c79d840e5ec201459fdeb0d9 Message-ID: <20120716161547.9VIKD7U-BNBtU5131TIjflVbwdN12zN-dA_4vdE9B5k@z> commit: f5e0ea775cc86046fc424a2c63e9709670a4fe6d Author: Andr=C3=A9 Erdmann mailerd de> AuthorDate: Mon Jul 16 11:17:20 2012 +0000 Commit: Andr=C3=A9 Erdmann mailerd de> CommitDate: Mon Jul 16 11:17:20 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/R_overlay.git= ;a=3Dcommit;h=3Df5e0ea77 move fix_ebuild_name to util --- roverlay/packageinfo.py | 9 ++------- roverlay/util.py | 10 ++++++++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/roverlay/packageinfo.py b/roverlay/packageinfo.py index cc09a6b..052fad7 100644 --- a/roverlay/packageinfo.py +++ b/roverlay/packageinfo.py @@ -41,10 +41,6 @@ class PackageInfo ( object ): config.get_or_fail ( 'R_PACKAGE.suffix_regex' ) + '$' ) =20 - ILLEGAL_NAME_CHARS =3D re.compile ( "[.:]{1,}" ) - ILLEGAL_NAME_CHARS_REPLACE_BY =3D '_' - - def __init__ ( self, **initial_info ): """Initializes a PackageInfo. =20 @@ -308,9 +304,8 @@ class PackageInfo ( object ): # using pkg_version for the ebuild version =20 # removing illegal chars from the package_name - ebuild_name =3D PackageInfo.ILLEGAL_NAME_CHARS.sub ( - PackageInfo.ILLEGAL_NAME_CHARS_REPLACE_BY, package_name - ) + ebuild_name =3D util.fix_ebuild_name ( package_name ) + if ebuild_name !=3D package_name: self ['name'] =3D ebuild_name =20 diff --git a/roverlay/util.py b/roverlay/util.py index f66532a..d658b15 100644 --- a/roverlay/util.py +++ b/roverlay/util.py @@ -11,6 +11,16 @@ from roverlay import config =20 LOGGER =3D logging.getLogger ( 'util' ) =20 +_EBUILD_NAME_ILLEGAL_CHARS =3D re.compile ( "[.:]{1,}" ) +_EBUILD_NAME_ILLEGAL_CHARS_REPLACE_BY =3D '_' + +def fix_ebuild_name ( name ): + return _EBUILD_NAME_ILLEGAL_CHARS.sub ( + _EBUILD_NAME_ILLEGAL_CHARS_REPLACE_BY, + name + ) +# --- end of fix_ebuild_name (...) --- + def shorten_str ( s, maxlen, replace_end=3DNone ): if not replace_end is None: rlen =3D maxlen - len ( replace_end )