* [gentoo-commits] proj/R_overlay:master commit in: roverlay/ebuild/
2012-07-30 8:52 [gentoo-commits] proj/R_overlay:overlay_wip commit in: roverlay/ebuild/ André Erdmann
@ 2012-07-30 8:52 ` André Erdmann
0 siblings, 0 replies; 2+ messages in thread
From: André Erdmann @ 2012-07-30 8:52 UTC (permalink / raw
To: gentoo-commits
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 (...) ---
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/R_overlay:overlay_wip commit in: roverlay/ebuild/
@ 2012-07-30 8:52 André Erdmann
2012-07-30 8:52 ` [gentoo-commits] proj/R_overlay:master " André Erdmann
0 siblings, 1 reply; 2+ messages in thread
From: André Erdmann @ 2012-07-30 8:52 UTC (permalink / raw
To: gentoo-commits
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 (...) ---
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-30 8:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-30 8:52 [gentoo-commits] proj/R_overlay:overlay_wip commit in: roverlay/ebuild/ André Erdmann
2012-07-30 8:52 ` [gentoo-commits] proj/R_overlay:master " André Erdmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox