1 |
Author: zmedico |
2 |
Date: 2008-10-02 00:44:51 +0000 (Thu, 02 Oct 2008) |
3 |
New Revision: 11605 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/portage/elog/__init__.py |
7 |
Log: |
8 |
When parsing PORTAGE_ELOG_SYSTEM, stack values in a dict so that things like |
9 |
"echo:info echo:qa" stack like one might expect. Thanks to Betelgeuse for |
10 |
reporting. |
11 |
|
12 |
|
13 |
Modified: main/trunk/pym/portage/elog/__init__.py |
14 |
=================================================================== |
15 |
--- main/trunk/pym/portage/elog/__init__.py 2008-10-01 21:17:32 UTC (rev 11604) |
16 |
+++ main/trunk/pym/portage/elog/__init__.py 2008-10-02 00:44:51 UTC (rev 11605) |
17 |
@@ -91,6 +91,19 @@ |
18 |
all_logentries[key], _preserve_logentries[key] = phasefilter(all_logentries[key]) |
19 |
|
20 |
my_elog_classes = set(mysettings.get("PORTAGE_ELOG_CLASSES", "").split()) |
21 |
+ logsystems = {} |
22 |
+ for token in mysettings.get("PORTAGE_ELOG_SYSTEM", "").split(): |
23 |
+ if ":" in token: |
24 |
+ s, levels = token.split(":", 1) |
25 |
+ levels = levels.split(",") |
26 |
+ else: |
27 |
+ s = token |
28 |
+ levels = () |
29 |
+ levels_set = logsystems.get(s) |
30 |
+ if levels_set is None: |
31 |
+ levels_set = set() |
32 |
+ logsystems[s] = levels_set |
33 |
+ levels_set.update(levels) |
34 |
|
35 |
for key in all_logentries: |
36 |
default_logentries = filter_loglevels(all_logentries[key], my_elog_classes) |
37 |
@@ -106,12 +119,9 @@ |
38 |
default_logentries, default_fulllog) |
39 |
|
40 |
# pass the processing to the individual modules |
41 |
- logsystems = mysettings["PORTAGE_ELOG_SYSTEM"].split() |
42 |
- for s in logsystems: |
43 |
+ for s, levels in logsystems.iteritems(): |
44 |
# allow per module overrides of PORTAGE_ELOG_CLASSES |
45 |
- if ":" in s: |
46 |
- s, levels = s.split(":", 1) |
47 |
- levels = levels.split(",") |
48 |
+ if levels: |
49 |
mod_logentries = filter_loglevels(all_logentries[key], levels) |
50 |
mod_fulllog = _combine_logentries(mod_logentries) |
51 |
else: |