glenux/vagrant-lxc-ng
glenux/vagrant-lxc-ng
1
0
Fork 0
Code Issues 4 Pull requests Projects 1 Releases Packages Wiki Activity

revert

Browse source
This commit is contained in:
Fabio Rehm 2014-03-11 19:58:08 -03:00
parent aef40d5b42
commit 1072a42ed2
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Gemfile
View file

@ -7,7 +7,7 @@ if ENV['USER'] != 'vagrant'
end end
group :development do group :development do
gem 'vagrant', github: 'mitchellh/vagrant' gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
gem 'guard' gem 'guard'
gem 'guard-rspec' gem 'guard-rspec'
gem 'rb-inotify' gem 'rb-inotify'
@ -15,15 +15,16 @@ end
group :development, :test do group :development, :test do
gem 'rake' gem 'rake'
# Update https://github.com/fgrehm/vagrant-lxc/issues/111 # TODO: Update https://github.com/fgrehm/vagrant-lxc/issues/111
gem 'rspec', '2.99.0.beta2' gem 'rspec', '2.99.0.beta2'
gem 'coveralls', require: false gem 'coveralls', require: false
gem 'vagrant-spec', github: 'mitchellh/vagrant-spec' gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git'
end end
group :plugins do group :plugins do
gem 'vagrant-lxc', path: '.' gem 'vagrant-lxc', path: '.'
gem 'vagrant-cachier', github: 'fgrehm/vagrant-cachier' # TODO: Disable these plugins when running acceptance specs
gem 'vagrant-pristine', github: 'fgrehm/vagrant-pristine' gem 'vagrant-cachier', git: 'https://github.com/fgrehm/vagrant-cachier.git'
gem 'vagrant-pristine', git: 'https://github.com/fgrehm/vagrant-pristine.git'
gem 'vagrant-omnibus' gem 'vagrant-omnibus'
end end

8
Gemfile.lock
View file

@ -1,17 +1,17 @@
GIT GIT
remote: git://github.com/fgrehm/vagrant-cachier.git remote: https://github.com/fgrehm/vagrant-cachier.git
revision: 2df1e319408a7e6f1c6e75d48e36591199e98527 revision: 2df1e319408a7e6f1c6e75d48e36591199e98527
specs: specs:
vagrant-cachier (0.6.1.dev) vagrant-cachier (0.6.1.dev)
GIT GIT
remote: git://github.com/fgrehm/vagrant-pristine.git remote: https://github.com/fgrehm/vagrant-pristine.git
revision: 503dbc47848c81d0fbfa6840491856f518d244a1 revision: 503dbc47848c81d0fbfa6840491856f518d244a1
specs: specs:
vagrant-pristine (0.3.0) vagrant-pristine (0.3.0)
GIT GIT
remote: git://github.com/mitchellh/vagrant-spec.git remote: https://github.com/mitchellh/vagrant-spec.git
revision: 4c1bad4b06085c7f1296f8ea66d803a3717ddb00 revision: 4c1bad4b06085c7f1296f8ea66d803a3717ddb00
specs: specs:
vagrant-spec (0.0.1) vagrant-spec (0.0.1)
@ -21,7 +21,7 @@ GIT
thor (~> 0.18.1) thor (~> 0.18.1)
GIT GIT
remote: git://github.com/mitchellh/vagrant.git remote: https://github.com/mitchellh/vagrant.git
revision: 240523b1aa9f328c09060cff34a211bd3f93f7ca revision: 240523b1aa9f328c09060cff34a211bd3f93f7ca
specs: specs:
vagrant (1.5.1.dev) vagrant (1.5.1.dev)

1
lib/vagrant-lxc/driver.rb
View file

@ -87,6 +87,7 @@ module Vagrant
def forced_halt def forced_halt
@logger.info('Shutting down container...') @logger.info('Shutting down container...')
# TODO: Remove `lxc-shutdown` usage, graceful halt is enough
@cli.transition_to(:stopped) { |c| c.shutdown } @cli.transition_to(:stopped) { |c| c.shutdown }
# REFACTOR: Do not use exception to control the flow # REFACTOR: Do not use exception to control the flow
rescue CLI::TargetStateNotReached, CLI::ShutdownNotSupported rescue CLI::TargetStateNotReached, CLI::ShutdownNotSupported