Enable prer flow arguments

2 files changed, 9 insertions, 6 deletions

diff --git a/firstaidkit b/firstaidkit
index e25c1f7..874484e 100755
--- a/firstaidkit
+++ b/firstaidkit
@@ -143,7 +143,7 @@ def usage(name):
   --list           - list all plugins
   --info <plugin>  - get information about plugin
   --nodeps         - do not use plugin dependencies
-  --plugin-args=<plugin_name args>
+  --plugin-args=<plugin_name[/flow] args>
                    - optionally pass arguments to plugin_name
 """ % (name, name, name, name, name))
 
diff --git a/pyfirstaidkit/plugins.py b/pyfirstaidkit/plugins.py
index 3dda77c..65ef049 100644
--- a/pyfirstaidkit/plugins.py
+++ b/pyfirstaidkit/plugins.py
@@ -602,20 +602,23 @@ class PluginSystem(object):
                                 message = plugin)
                         return False
 
-        args = None
+        args = []
         if Config.has_section("plugin-args"):
             for (name, value) in Config.items("plugin-args"):
                 # We see if the args line begins with any plugin name.
-                m = re.search("^%s"%plugin, value)
+                m = re.search("^%s "%plugin, value)
                 if m:
-                    args = value.strip(plugin).strip(" ")
-                    break
+                    args.append(value.strip(plugin).strip(" "))
+                # We also want to be able to configure separate flows
+                m = re.search("^%s/%s "% (plugin, flowName), value)
+                if m:
+                    args.append(value.strip(plugin).strip(" "))
 
         infosection = getattr(Info, plugin)
         infosection.unlock()
         p = pklass(flowName, reporting = self._reporting,
                 dependencies = self._deps, backups = self._backups,
-                path = plugindir, info = infosection, args = args)
+                path = plugindir, info = infosection, args = " ".join(args))
         for (step, rv) in p: #autorun all the needed steps
             Logger.info("Running step %s in plugin %s ...", step, plugin)
             Logger.info("%s is current step and %s is result of that step." %