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 1Srtyw-0004Us-92 for garchives@archives.gentoo.org; Thu, 19 Jul 2012 16:53:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2BBA1E06E8; Thu, 19 Jul 2012 16:53:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EAB57E06E8 for ; Thu, 19 Jul 2012 16:53:28 +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 454FE1B404E for ; Thu, 19 Jul 2012 16:53:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 07E04E5434 for ; Thu, 19 Jul 2012 16:53:26 +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: <1342715088.b934d0728451c9c6127edcbfc40d5d28730c64a4.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:overlay_wip commit in: roverlay/depres/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/depres/depenv.py X-VCS-Directories: roverlay/depres/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: b934d0728451c9c6127edcbfc40d5d28730c64a4 X-VCS-Branch: overlay_wip Date: Thu, 19 Jul 2012 16:53:26 +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: bd833de3-a71d-419a-b32c-94385815872c X-Archives-Hash: 83432293d4acfa622976356ff0f8879f commit: b934d0728451c9c6127edcbfc40d5d28730c64a4 Author: Andr=C3=A9 Erdmann mailerd de> AuthorDate: Thu Jul 19 16:24:48 2012 +0000 Commit: Andr=C3=A9 Erdmann mailerd de> CommitDate: Thu Jul 19 16:24:48 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/R_overlay.git= ;a=3Dcommit;h=3Db934d072 handle versions correctly that start with a dot --- roverlay/depres/depenv.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/roverlay/depres/depenv.py b/roverlay/depres/depenv.py index 7cef1c9..69e9d57 100644 --- a/roverlay/depres/depenv.py +++ b/roverlay/depres/depenv.py @@ -73,12 +73,16 @@ class DepEnv ( object ): m =3D r.match ( self.dep_str_low ) if m is not None: =20 + version =3D self.__class__.FIXVERSION_REGEX.sub ( + '.', m.group ( 'ver' ) + ) + # fix versions like ".9" (-> "0.9") + if version [0] =3D=3D '.': version =3D '0' + version + result.append ( dict ( name =3D m.group ( 'name' ), version_modifier =3D m.group ( 'vmod' ), - version =3D self.__class__.FIXVERSION_REGEX.sub ( - '.', m.group ( 'ver' ) - ) + version =3D version ) ) =20 if not self.try_all_regexes: break 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 27F4913800E for ; Mon, 30 Jul 2012 08:54:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28E63E0676; Mon, 30 Jul 2012 08:52:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F0500E0662 for ; Mon, 30 Jul 2012 08:52:43 +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 4C5541B4012 for ; Mon, 30 Jul 2012 08:52:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DA431E5441 for ; Mon, 30 Jul 2012 08:52:40 +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: <1342715088.b934d0728451c9c6127edcbfc40d5d28730c64a4.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/depres/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/depres/depenv.py X-VCS-Directories: roverlay/depres/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: b934d0728451c9c6127edcbfc40d5d28730c64a4 X-VCS-Branch: master Date: Mon, 30 Jul 2012 08:52:40 +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: d0dd3457-fc02-454f-a91a-56b63294c36c X-Archives-Hash: e26eafecd17c3924db4ffe7e3f943140 Message-ID: <20120730085240.YXd3BfJgeB6Ockb_06vm-ekWzoLL7tF6VAXivbkStDM@z> commit: b934d0728451c9c6127edcbfc40d5d28730c64a4 Author: André Erdmann mailerd de> AuthorDate: Thu Jul 19 16:24:48 2012 +0000 Commit: André Erdmann mailerd de> CommitDate: Thu Jul 19 16:24:48 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b934d072 handle versions correctly that start with a dot --- roverlay/depres/depenv.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/roverlay/depres/depenv.py b/roverlay/depres/depenv.py index 7cef1c9..69e9d57 100644 --- a/roverlay/depres/depenv.py +++ b/roverlay/depres/depenv.py @@ -73,12 +73,16 @@ class DepEnv ( object ): m = r.match ( self.dep_str_low ) if m is not None: + version = self.__class__.FIXVERSION_REGEX.sub ( + '.', m.group ( 'ver' ) + ) + # fix versions like ".9" (-> "0.9") + if version [0] == '.': version = '0' + version + result.append ( dict ( name = m.group ( 'name' ), version_modifier = m.group ( 'vmod' ), - version = self.__class__.FIXVERSION_REGEX.sub ( - '.', m.group ( 'ver' ) - ) + version = version ) ) if not self.try_all_regexes: break