[gentoo-commits] proj/R_overlay:master commit in: roverlay/depres/simpledeprule/

[André Erdmann]

commit:     18ea92d1aeffa20e0f333fb0d187017a98cbfd67
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Aug 27 15:29:45 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Aug 27 15:29:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=18ea92d1

dep rule parser: '#! ERROR' statement

lets the dep parser raise an exception, which causes roverlay to exit.

---
 roverlay/depres/simpledeprule/rulemaker.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/roverlay/depres/simpledeprule/rulemaker.py b/roverlay/depres/simpledeprule/rulemaker.py
index 1edbdb9..f58f96b 100644
--- a/roverlay/depres/simpledeprule/rulemaker.py
+++ b/roverlay/depres/simpledeprule/rulemaker.py
@@ -25,7 +25,8 @@ from roverlay.depres.simpledeprule.pool import SimpleDependencyRulePool
 
 class SimpleRuleMaker ( roverlay.util.mapreader.MapFileParser ):
 
-   breakparse = set (( '! NOPARSE', '! BREAK' ))
+   breakparse = frozenset ({ '! NOPARSE', '! BREAK' })
+   kw_error   = frozenset ({ '! ERROR', })
 
    def __init__ ( self, rule_separator=None ):
       super ( SimpleRuleMaker, self ).__init__()
@@ -181,6 +182,11 @@ class SimpleRuleMaker ( roverlay.util.mapreader.MapFileParser ):
       elif line in self.breakparse:
          self.stop_reading = True
 
+      elif line in self.kw_error:
+         self.stop_reading = True
+         raise Exception ( "#! ERROR" )
+         return False
+
       # else is a "real" comment
       return True
    # --- end of handle_comment_line (...) ---