[Secstate-devel] [PATCH] Added error message and return code for 'show'

Also fixed several other return codes for other sub-commands. Fixes bug #7615 --- src/bin/secstate | 16 ++++++++-------- src/secstate/main.py | 3 +++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/bin/secstate b/src/bin/secstate index b4c484d..2962ad4 100644 --- a/src/bin/secstate +++ b/src/bin/secstate @@ -87,28 +87,28 @@ def main(): return remove_content(sys.argv[arg_num:]) elif subcommand == 'select': - select(sys.argv[arg_num:], True) + return select(sys.argv[arg_num:], True) elif subcommand == 'deselect': - select(sys.argv[arg_num:], False) + return select(sys.argv[arg_num:], False) elif subcommand == 'audit': - audit(sys.argv[arg_num:]) + return audit(sys.argv[arg_num:]) elif subcommand == 'search': - search(sys.argv[arg_num:]) + return search(sys.argv[arg_num:]) elif subcommand == 'list': - list_content(sys.argv[arg_num:]) + return list_content(sys.argv[arg_num:]) elif subcommand == 'show': - show(sys.argv[arg_num:]) + return show(sys.argv[arg_num:]) elif subcommand == 'remediate': - remediate(sys.argv[arg_num:]) + return remediate(sys.argv[arg_num:]) elif subcommand == 'save': - save_profile(sys.argv[arg_num:]) + return save_profile(sys.argv[arg_num:]) else: sys.stderr.write("Uknown subcommand: %(command)s" % {'command':subcommand}) diff --git a/src/secstate/main.py b/src/secstate/main.py index 9a77b16..712878b 100644 --- a/src/secstate/main.py +++ b/src/secstate/main.py @@ -752,6 +752,9 @@ class Secstate: return True + self.log.error("Item '%(id)s' could not be found in the imported content" % {'id':item_id}) + return False + def sublist(self, content, arg, recurse, show_all, tabs=0): tabstr = "\t" * tabs selected = "" -- 1.7.2.1