Merge branch 'cli-run-mode'

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/ohai/application.rb b/lib/ohai/application.rb
index 023cfdb8..e1640e8c 100644
--- a/lib/ohai/application.rb
+++ b/lib/ohai/application.rb
@@ -77,6 +77,7 @@ class Ohai::Application
 
   def configure_ohai
     @attributes = parse_options
+    @attributes = nil if @attributes.empty?
 
     Ohai::Config.merge!(config)
     if Ohai::Config[:directory]
@@ -94,9 +95,9 @@ class Ohai::Application
     if Ohai::Config[:file]
       ohai.from_file(Ohai::Config[:file])
     else
-      ohai.all_plugins
+      ohai.all_plugins(@attributes)
     end
-    if @attributes.length > 0
+    if @attributes
       @attributes.each do |a|
         puts ohai.attributes_print(a)
       end