Fixes bug #7906
---
src/bin/secstate | 4 +---
src/secstate/main.py | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/bin/secstate b/src/bin/secstate
index f658dc9..7f03e61 100644
--- a/src/bin/secstate
+++ b/src/bin/secstate
@@ -148,8 +148,6 @@ def help(arg):
def import_content(arguments):
parser = OptionParser(usage="secstate import [options] <content>")
- parser.add_option('-c', '--cpe', action='store_true',
dest='cpe', default=False,
- help="Imports the specified CPE content")
parser.add_option('-p', '--puppet', action='store_true',
dest='puppet', default=False,
help="Imports the specified puppet content")
parser.add_option('--profile', action='store', type='string',
dest='profile', default=secstate.NONE_PROFILE,
@@ -157,7 +155,7 @@ def import_content(arguments):
(options, args) = parser.parse_args(arguments)
for arg in args:
- content = sec_instance.import_content(arg, options.cpe, options.puppet,
save=True, active_profile=options.profile)
+ content = sec_instance.import_content(arg, options.puppet, save=True,
active_profile=options.profile)
if content == None:
return -1
diff --git a/src/secstate/main.py b/src/secstate/main.py
index 711d335..3c63d83 100644
--- a/src/secstate/main.py
+++ b/src/secstate/main.py
@@ -391,7 +391,7 @@ class Secstate:
return benchmark
- def import_content(self, content, cpe=False, puppet=False, changes=True, save=False,
active_profile=NONE_PROFILE):
+ def import_content(self, content, puppet=False, changes=True, save=False,
active_profile=NONE_PROFILE):
"""
Function: Validates XCCDF/OVAL content and optionally saves it to the data
store
Input: File containing content
@@ -411,7 +411,7 @@ class Secstate:
return None
if self.content.has_key(content):
- return self.import_content(self.content[content], cpe, puppet, changes,
active_profile=active_profile)
+ return self.import_content(self.content[content], puppet, changes,
active_profile=active_profile)
if save:
store_path = self.config.get('secstate', 'benchmark_dir')
--
1.7.2.2