From 361f08bad8d059bd8ca9346dfae4b56e16fb9f19 Mon Sep 17 00:00:00 2001 From: Steve Beattie Date: Mon, 24 Feb 2014 14:22:35 -0800 Subject: [PATCH] utils: fix cmd reference in apparmor/tools.py This patch fixes up the parser command invocation via apparmor/common.py:cmd(), as it handles stdout/stderr redirection, and the redirection that was being attempted were being handed as arguments to the parser. Signed-off-by: Steve Beattie Acked-by: Christian Boltz --- utils/apparmor/tools.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/utils/apparmor/tools.py b/utils/apparmor/tools.py index 23d704c8a..6deda7624 100644 --- a/utils/apparmor/tools.py +++ b/utils/apparmor/tools.py @@ -16,7 +16,7 @@ import sys import apparmor.aa as apparmor import apparmor.ui as aaui -from apparmor.common import user_perm +from apparmor.common import user_perm, cmd # setup module translations from apparmor.translations import init_translation @@ -118,8 +118,7 @@ class aa_tools: # One simply does not walk in here! raise apparmor.AppArmorException('Unknown tool: %s' % self.name) - cmd_info = apparmor.cmd([apparmor.parser, filename, '-I%s' % apparmor.profile_dir, '-R 2>&1', '1>/dev/null']) - #cmd_info = apparmor.cmd(['cat', filename, '|', apparmor.parser, '-I%s'%apparmor.profile_dir, '-R 2>&1', '1>/dev/null']) + cmd_info = cmd([apparmor.parser, '-I%s' % apparmor.profile_dir, '-R', filename]) if cmd_info[0] != 0: raise apparmor.AppArmorException(cmd_info[1])