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 592161381F3 for ; Fri, 5 Jul 2013 16:56:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71B33E0AA7; Fri, 5 Jul 2013 16:55:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 77CF6E0AB7 for ; Fri, 5 Jul 2013 16:55:47 +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 7AF8833E911 for ; Fri, 5 Jul 2013 16:55:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3B5C5E546A for ; Fri, 5 Jul 2013 16:55:44 +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: <1373042666.1b546a7d744a8c7272545ef299e5fa4f2f47b098.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:gsoc13/next 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: 1b546a7d744a8c7272545ef299e5fa4f2f47b098 X-VCS-Branch: gsoc13/next Date: Fri, 5 Jul 2013 16:55:44 +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: a42e44bb-dfba-430b-af7d-08b1d6660f97 X-Archives-Hash: dd10fc3f6a216817b72c13f6c0c1bfaa commit: 1b546a7d744a8c7272545ef299e5fa4f2f47b098 Author: André Erdmann mailerd de> AuthorDate: Fri Jul 5 16:44:26 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Fri Jul 5 16:44:26 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=1b546a7d roverlay/depres/depenv: use versiontuple --- roverlay/depres/depenv.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/roverlay/depres/depenv.py b/roverlay/depres/depenv.py index 3d324a4..972dc79 100644 --- a/roverlay/depres/depenv.py +++ b/roverlay/depres/depenv.py @@ -15,6 +15,9 @@ dependency string to be looked up, its resolution progess ("to be resolved", __all__ = [ 'DepEnv', ] import re + +import roverlay.versiontuple + from roverlay import strutil class DepEnv ( object ): @@ -63,15 +66,16 @@ class DepEnv ( object ): _VERMOD = '(?P[<>]|[=<>!]?[=])' # integer representation of version modifiers - VMOD_NONE = 0 - VMOD_UNDEF = 1 - VMOD_NOT = 2 - VMOD_EQ = 4 - VMOD_NE = VMOD_NOT | VMOD_EQ - VMOD_GT = 8 - VMOD_GE = VMOD_EQ | VMOD_GT - VMOD_LT = 16 - VMOD_LE = VMOD_EQ | VMOD_LT + ## duplicate of versiontuple.py + VMOD_NONE = roverlay.versiontuple.VMOD_NONE + VMOD_UNDEF = roverlay.versiontuple.VMOD_UNDEF + VMOD_NOT = roverlay.versiontuple.VMOD_NOT + VMOD_EQ = roverlay.versiontuple.VMOD_EQ + VMOD_NE = roverlay.versiontuple.VMOD_NE + VMOD_GT = roverlay.versiontuple.VMOD_GT + VMOD_GE = roverlay.versiontuple.VMOD_GE + VMOD_LT = roverlay.versiontuple.VMOD_LT + VMOD_LE = roverlay.versiontuple.VMOD_LE VMOD = { '!=' : VMOD_NE, @@ -195,7 +199,9 @@ class DepEnv ( object ): version_modifier = vmod, version = version, version_strlist = version_strlist, - version_tuple = tuple ( version_iparts ), + version_tuple = roverlay.versiontuple.IntVersionTuple ( + version_iparts + ), vmod = self.VMOD.get ( vmod, self.VMOD_UNDEF ), ) )