From: "André Erdmann" <dywi@mailerd.de> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] proj/R_overlay:overlay_wip commit in: roverlay/ebuild/ Date: Mon, 30 Jul 2012 08:52:47 +0000 (UTC) [thread overview] Message-ID: <1343637690.205370a34a6c5b51e4f1c446341b53813a7c89bf.dywi@gentoo> (raw) commit: 205370a34a6c5b51e4f1c446341b53813a7c89bf Author: André Erdmann <dywi <AT> mailerd <DOT> de> AuthorDate: Mon Jul 30 08:41:30 2012 +0000 Commit: André Erdmann <dywi <AT> mailerd <DOT> 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 (...) ---
WARNING: multiple messages have this Message-ID (diff)
From: "André Erdmann" <dywi@mailerd.de> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] proj/R_overlay:master commit in: roverlay/ebuild/ Date: Mon, 30 Jul 2012 08:52:45 +0000 (UTC) [thread overview] Message-ID: <1343637690.205370a34a6c5b51e4f1c446341b53813a7c89bf.dywi@gentoo> (raw) Message-ID: <20120730085245.GGSdHnOk4-deir7-nAGguPH-B2SY6aLb31J0LU6ynkQ@z> (raw) commit: 205370a34a6c5b51e4f1c446341b53813a7c89bf Author: André Erdmann <dywi <AT> mailerd <DOT> de> AuthorDate: Mon Jul 30 08:41:30 2012 +0000 Commit: André Erdmann <dywi <AT> mailerd <DOT> 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 (...) ---
next reply other threads:[~2012-07-30 8:55 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-07-30 8:52 André Erdmann [this message] 2012-07-30 8:52 ` [gentoo-commits] proj/R_overlay:master commit in: roverlay/ebuild/ André Erdmann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1343637690.205370a34a6c5b51e4f1c446341b53813a7c89bf.dywi@gentoo \ --to=dywi@mailerd.de \ --cc=gentoo-commits@lists.gentoo.org \ --cc=gentoo-dev@lists.gentoo.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox