Merge pull request #162 from avokhmin/master

#157: FetchIpFromDnsmasqLeases returns []

lib/vagrant-lxc/driver/cli.rb

@@ -119,7 +119,7 @@ module Vagrant
 
         def supports_attach_with_namespaces?
           unless defined?(@supports_attach_with_namespaces)
-            @supports_attach_with_namespaces = run(:attach, '-h', '2>&1').include?('--namespaces')
+            @supports_attach_with_namespaces = run(:attach, '-h', :show_stderr => true).values.join.include?('--namespaces')
           end
 
           return @supports_attach_with_namespaces

lib/vagrant-lxc/sudo_wrapper.rb

@@ -58,7 +58,12 @@ module Vagrant
 
         # Return the output, making sure to replace any Windows-style
         # newlines with Unix-style.
-        r.stdout.gsub("\r\n", "\n")
+        stdout = r.stdout.gsub("\r\n", "\n")
+        if opts[:show_stderr]
+          { :stdout => stdout, :stderr => r.stderr.gsub("\r\n", "\n") }
+        else
+          stdout
+        end
       end
 
       def raw(*command, &block)

spec/unit/driver/cli_spec.rb

@@ -146,13 +146,13 @@ describe Vagrant::LXC::Driver::CLI do
     end
 
     it 'supports a "namespaces" parameter' do
-      subject.stub(:run).with(:attach, '-h', '2>&1').and_return('--namespaces')
+      subject.stub(:run).with(:attach, '-h', :show_stderr => true).and_return({:stdout => '', :stderr => '--namespaces'})
       subject.attach *(command + [{namespaces: ['network', 'mount']}])
       subject.should have_received(:run).with(:attach, '--name', name, '--namespaces', 'NETWORK|MOUNT', '--', *command)
     end
 
     it 'raises a NamespacesNotSupported error if not supported' do
-      subject.stub(:run).with(:attach, '-h', '2>&1').and_return('not supported')
+      subject.stub(:run).with(:attach, '-h', :show_stderr => true).and_return({:stdout => '', :stderr => 'not supported'})
       expect {
         subject.attach *(command + [{namespaces: ['network', 'mount']}])
       }.to raise_error(Vagrant::LXC::Errors::NamespacesNotSupported)