[Secstate-devel] [PATCH] Fixed issue showing deselected content when listing
Fixes bug #7891
---
src/secstate/main.py | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/secstate/main.py b/src/secstate/main.py
index 9bd0579..33abb3f 100644
--- a/src/secstate/main.py
+++ b/src/secstate/main.py
@@ -849,21 +849,24 @@ class Secstate:
selected = ""
profile = ""
+ is_selected = False
if not content.__dict__.has_key('oval'):
if self.content.has_key(arg):
if content.config.getboolean(arg, 'selected'):
+ is_selected = True
if show_all:
selected = "[X]"
else:
selected = "[ ]"
- print "%(indent)s%(sel)sOVAL File - ID: %(id)s" %
{'indent':tabstr, 'sel':selected, 'id':arg}
+
+ if is_selected or show_all:
+ print "%(indent)s%(sel)sOVAL File - ID: %(id)s" %
{'indent':tabstr, 'sel':selected, 'id':arg}
else:
defn = content.get_definition(arg)
if defn != None:
print "%(indent)sDefinition - ID: %(id)s, Title:
'%(title)s'" % {'indent':tabstr, 'id':arg,
'title':defn.title}
else:
- is_selected = False
item = None
if arg == content.id:
item = content.to_item()
@@ -892,7 +895,7 @@ class Secstate:
if not recurse or (tabs == 0):
selected = "[ ]"
- if show_all or is_selected or not recurse:
+ if show_all or is_selected:
print "%(indent)s%(sel)s%(type)s - ID: %(id)s, Title:
'%(title)s'%(prof)s" % {'indent':tabstr, 'sel':selected,
'type':item_get_type_str(item), 'id':arg,
'title':title.text,
--
1.7.2.2