Commit 580785b5 by devttys0

Added support for allowing the extractor dependency module to override other…

Added support for allowing the extractor dependency module to override other module's verbose setting.
parent c3911ed3
...@@ -457,6 +457,11 @@ class Module(object): ...@@ -457,6 +457,11 @@ class Module(object):
self.status = parent.status self.status = parent.status
self.modules = parent.loaded_modules self.modules = parent.loaded_modules
# A special exception for the extractor module, which should be allowed to
# override the verbose setting, e.g., if --matryoshka has been specified
if hasattr(self, "extractor") and self.extractor.config.verbose:
self.config.verbose = self.config.display.verbose = True
# Reset all dependency modules # Reset all dependency modules
for dependency in self.dependencies: for dependency in self.dependencies:
if hasattr(self, dependency.attribute): if hasattr(self, dependency.attribute):
......
...@@ -86,6 +86,9 @@ class Extractor(Module): ...@@ -86,6 +86,9 @@ class Extractor(Module):
for manual_rule in self.manual_rules: for manual_rule in self.manual_rules:
self.add_rule(manual_rule) self.add_rule(manual_rule)
if self.matryoshka:
self.config.verbose = True
def reset(self): def reset(self):
# Holds a list of pending files that should be scanned; only populated if self.matryoshka == True # Holds a list of pending files that should be scanned; only populated if self.matryoshka == True
self.pending = [] self.pending = []
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment