1 |
commit: 5a8f2a07655db3a15af5c82d4d8fffd14c7582d8 |
2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
3 |
AuthorDate: Fri Jul 6 22:12:07 2012 +0000 |
4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
5 |
CommitDate: Fri Jul 6 22:12:07 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=5a8f2a07 |
7 |
|
8 |
make listener modules and dep rule pools optional |
9 |
|
10 |
modified: roverlay/recipe/easyresolver.py |
11 |
|
12 |
--- |
13 |
roverlay/recipe/easyresolver.py | 23 ++++++++++++----------- |
14 |
1 files changed, 12 insertions(+), 11 deletions(-) |
15 |
|
16 |
diff --git a/roverlay/recipe/easyresolver.py b/roverlay/recipe/easyresolver.py |
17 |
index c083bda..e510181 100644 |
18 |
--- a/roverlay/recipe/easyresolver.py |
19 |
+++ b/roverlay/recipe/easyresolver.py |
20 |
@@ -12,19 +12,20 @@ def setup(): |
21 |
|
22 |
srule_pool = SimpleDependencyRulePool ( 'default pool', priority=45 ) |
23 |
|
24 |
- srule_files = config.get_or_fail ( 'DEPRES.simple_rules.files' ) |
25 |
+ srule_files = config.get ( 'DEPRES.simple_rules.files', None ) |
26 |
|
27 |
- unres_listener = listeners.UnresolvableSetFileListener ( |
28 |
- config.get_or_fail ( 'LOG.FILE.unresolvable' ) |
29 |
- ) |
30 |
+ if srule_files: |
31 |
+ if isinstance ( srule_files, str ): |
32 |
+ srule_pool.load_rule_file ( srule_files ) |
33 |
+ else: |
34 |
+ for f in srule_files: |
35 |
+ srule_pool.load_rule_file ( f ) |
36 |
|
37 |
- if isinstance ( srule_files, str ): |
38 |
- srule_pool.load_rule_file ( srule_files ) |
39 |
- else: |
40 |
- for f in srule_files: |
41 |
- srule_pool.load_rule_file ( f ) |
42 |
+ res.add_rulepool ( srule_pool ) |
43 |
|
44 |
- res.add_rulepool ( srule_pool ) |
45 |
- res.add_listener ( unres_listener ) |
46 |
+ unres_file = config.get ( 'LOG.FILE.unresolvable', None ) |
47 |
+ if unres_file: |
48 |
+ unres_listener = listeners.UnresolvableSetFileListener ( unres_file ) |
49 |
+ res.add_listener ( unres_listener ) |
50 |
return res |
51 |
# --- end of setup (...) --- |