lib/chef/shef.rb in chef-0.8.16 vs lib/chef/shef.rb in chef-0.9.0.a3

@@ -125,11 +125,11 @@
     exit exit_status
   end
   
   def self.client_type
     type = Shef::StandAloneSession
-    type = Shef::SoloSession   if Chef::Config[:solo]
+    type = Shef::SoloSession   if Chef::Config[:shef_solo]
     type = Shef::ClientSession if Chef::Config[:client]
     type
   end
   
   def self.parse_opts
@@ -159,14 +159,15 @@
       :long         => "--standalone",
       :description  => "standalone shef session",
       :default      => true,
       :boolean      => true
 
-    option :solo,
+    option :shef_solo,
       :short        => "-s",
       :long         => "--solo",
       :description  => "chef-solo shef session",
-      :boolean      => true
+      :boolean      => true,
+      :proc         => proc {Chef::Config[:solo] = true}
 
     option :client,
       :short        => "-z",
       :long         => "--client",
       :description  => "chef-client shef session",
\ No newline at end of file