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 2B90513800E for ; Mon, 30 Jul 2012 08:55:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21138E070C; Mon, 30 Jul 2012 08:52:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E6C2AE070C for ; Mon, 30 Jul 2012 08:52:51 +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 21F131B401B for ; Mon, 30 Jul 2012 08:52:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 81D80E5443 for ; Mon, 30 Jul 2012 08:52:47 +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: <1343637690.205370a34a6c5b51e4f1c446341b53813a7c89bf.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:overlay_wip commit in: roverlay/ebuild/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/ebuild/depres.py X-VCS-Directories: roverlay/ebuild/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 205370a34a6c5b51e4f1c446341b53813a7c89bf X-VCS-Branch: overlay_wip Date: Mon, 30 Jul 2012 08:52: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 X-Archives-Salt: 092ab5bb-521b-4540-921b-1a550f8d717b X-Archives-Hash: 78a9f277caa3bf3c05e7f328711aba02 commit: 205370a34a6c5b51e4f1c446341b53813a7c89bf Author: André Erdmann mailerd de> AuthorDate: Mon Jul 30 08:41:30 2012 +0000 Commit: André Erdmann mailerd de> CommitDate: Mon Jul 30 08:41:30 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=205370a3 try to filter deps, but don't fail --- roverlay/ebuild/depres.py | 50 ++++++++++++++++++++++++-------------------- 1 files changed, 27 insertions(+), 23 deletions(-) diff --git a/roverlay/ebuild/depres.py b/roverlay/ebuild/depres.py index b3cd38c..8b38e91 100644 --- a/roverlay/ebuild/depres.py +++ b/roverlay/ebuild/depres.py @@ -175,36 +175,40 @@ class EbuildDepRes ( object ): def _make_result ( self ): """Make evars using the depres result.""" def dep_allowed ( dep ): - #FIXME hardcoded + try: + #FIXME hardcoded + #FIXME fails for "qt-core" etc. - # the oldest version of dev-lang/R in portage - OLDEST_R_VERSION = ( 2, 20, 1 ) + # the oldest version of dev-lang/R in portage + OLDEST_R_VERSION = ( 2, 20, 1 ) - if not dep: - return False - - cat, sep, remainder = dep.partition ( '/' ) - - if not sep: - raise Exception ( "bad dependency string '%s'!" % dep ) + if not dep: + return False - dep_list = remainder.split ( '-', 2 ) + cat, sep, remainder = dep.partition ( '/' ) - if len ( dep_list ) < 2: - ver = ( 0, ) - else: - ver = tuple ( int (x) for x in dep_list [1].split ( '.' ) ) + if not sep: + raise Exception ( "bad dependency string '%s'!" % dep ) + dep_list = remainder.split ( '-', 2 ) - if cat.endswith ( 'dev-lang' ) \ - and dep_list [0] == 'R' \ - and cat [0] != '!' \ - : - if not ver: - # filters out 'dev-lang/R' - return False + if len ( dep_list ) < 2: + ver = ( 0, ) else: - return ver > OLDEST_R_VERSION + ver = tuple ( int (x) for x in dep_list [1].split ( '.' ) ) + + + if cat.endswith ( 'dev-lang' ) \ + and dep_list [0] == 'R' \ + and cat [0] != '!' \ + : + if not ver: + # filters out 'dev-lang/R' + return False + else: + return ver > OLDEST_R_VERSION + except Exception as e: + self.logger.exception ( e ) return True # --- end of dep_allowed (...) --- 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 60E4613800E for ; Mon, 30 Jul 2012 08:54:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E1FCE06F9; Mon, 30 Jul 2012 08:52:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2E75AE06F7 for ; Mon, 30 Jul 2012 08:52:49 +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 797961B4020 for ; Mon, 30 Jul 2012 08:52:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E8DE0E543C for ; Mon, 30 Jul 2012 08:52:45 +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: <1343637690.205370a34a6c5b51e4f1c446341b53813a7c89bf.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/ebuild/ X-VCS-Repository: proj/R_overlay X-VCS-Files: roverlay/ebuild/depres.py X-VCS-Directories: roverlay/ebuild/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 205370a34a6c5b51e4f1c446341b53813a7c89bf X-VCS-Branch: master Date: Mon, 30 Jul 2012 08:52: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 X-Archives-Salt: 54b834d2-2f4f-4b5f-b553-8e65f9e0f36e X-Archives-Hash: f841f00bbaf3ee1c1058826dcc1b82a2 Message-ID: <20120730085245.GGSdHnOk4-deir7-nAGguPH-B2SY6aLb31J0LU6ynkQ@z> commit: 205370a34a6c5b51e4f1c446341b53813a7c89bf Author: André Erdmann mailerd de> AuthorDate: Mon Jul 30 08:41:30 2012 +0000 Commit: André Erdmann mailerd de> CommitDate: Mon Jul 30 08:41:30 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=205370a3 try to filter deps, but don't fail --- roverlay/ebuild/depres.py | 50 ++++++++++++++++++++++++-------------------- 1 files changed, 27 insertions(+), 23 deletions(-) diff --git a/roverlay/ebuild/depres.py b/roverlay/ebuild/depres.py index b3cd38c..8b38e91 100644 --- a/roverlay/ebuild/depres.py +++ b/roverlay/ebuild/depres.py @@ -175,36 +175,40 @@ class EbuildDepRes ( object ): def _make_result ( self ): """Make evars using the depres result.""" def dep_allowed ( dep ): - #FIXME hardcoded + try: + #FIXME hardcoded + #FIXME fails for "qt-core" etc. - # the oldest version of dev-lang/R in portage - OLDEST_R_VERSION = ( 2, 20, 1 ) + # the oldest version of dev-lang/R in portage + OLDEST_R_VERSION = ( 2, 20, 1 ) - if not dep: - return False - - cat, sep, remainder = dep.partition ( '/' ) - - if not sep: - raise Exception ( "bad dependency string '%s'!" % dep ) + if not dep: + return False - dep_list = remainder.split ( '-', 2 ) + cat, sep, remainder = dep.partition ( '/' ) - if len ( dep_list ) < 2: - ver = ( 0, ) - else: - ver = tuple ( int (x) for x in dep_list [1].split ( '.' ) ) + if not sep: + raise Exception ( "bad dependency string '%s'!" % dep ) + dep_list = remainder.split ( '-', 2 ) - if cat.endswith ( 'dev-lang' ) \ - and dep_list [0] == 'R' \ - and cat [0] != '!' \ - : - if not ver: - # filters out 'dev-lang/R' - return False + if len ( dep_list ) < 2: + ver = ( 0, ) else: - return ver > OLDEST_R_VERSION + ver = tuple ( int (x) for x in dep_list [1].split ( '.' ) ) + + + if cat.endswith ( 'dev-lang' ) \ + and dep_list [0] == 'R' \ + and cat [0] != '!' \ + : + if not ver: + # filters out 'dev-lang/R' + return False + else: + return ver > OLDEST_R_VERSION + except Exception as e: + self.logger.exception ( e ) return True # --- end of dep_allowed (...) ---