Merge branch 'master' of https://github.com/hiono/vagrant-lxc into next

Conflicts: lib/vagrant-lxc/driver/cli.rb
2014-02-02 19:50:58 -02:00 · 2014-02-02 19:50:58 -02:00 · 95e111c322
commit 95e111c322
parent 5db318d26f 6d7bf5d188
1 changed files with 1 additions and 1 deletions
--- a/lib/vagrant-lxc/driver/cli.rb
+++ b/lib/vagrant-lxc/driver/cli.rb
@ -38,7 +38,7 @@ module Vagrant
        end

        def state
-          if @name && run(:info, '--name', @name, retryable: true) =~ /^[Ss]tate: *[^A-Z]+([A-Z]+)$/
+          if @name && run(:info, '--name', @name, retryable: true) =~ /^state:[^A-Z]+([A-Z]+)$/i
            $1.downcase.to_sym
          elsif @name
            :unknown