Only list selected items unless 'show_all' is set. Also fixed a
potential segfault.
---
src/secstate/main.py | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/secstate/main.py b/src/secstate/main.py
index e91649d..84a6caf 100644
--- a/src/secstate/main.py
+++ b/src/secstate/main.py
@@ -755,7 +755,7 @@ class Secstate:
else:
item = oscap.xccdf_benchmark_get_item(benchmark, arg)
if item == None:
- self.sublist(None, bench_cfg, def_model, arg, recurse, show_all,
tabs)
+ return self.sublist(None, bench_cfg, def_model, arg, recurse,
show_all, tabs)
is_selected = oscap.xccdf_item_get_selected(item)
@@ -788,9 +788,10 @@ class Secstate:
if not recurse or (tabs == 0):
selected = "[ ]"
- print "%(indent)s%(sel)s%(type)s - ID: %(id)s, Title:
'%(title)s'" % {'indent':tabstr, 'sel':selected,
-
'type':item_get_type_str(item), 'id':arg,
-
'title':oscap.oscap_text_get_text(title)}
+ if show_all or is_selected or not recurse:
+ print "%(indent)s%(sel)s%(type)s - ID: %(id)s, Title:
'%(title)s'" % {'indent':tabstr, 'sel':selected,
+
'type':item_get_type_str(item), 'id':arg,
+
'title':oscap.oscap_text_get_text(title)}
if recurse:
type = oscap.xccdf_item_get_type(item)
if (type == oscap.XCCDF_GROUP) or (type == oscap.XCCDF_BENCHMARK):
--
1.7.1.1
Show replies by date