diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch')
-rw-r--r-- | nixpkgs/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch b/nixpkgs/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch index 75b8f0cf8dfe..ae0b3f37d505 100644 --- a/nixpkgs/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch +++ b/nixpkgs/pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch @@ -78,18 +78,18 @@ index c019f30ff..ba7e40076 100755 at_exit(&Vagrant::Bundler.instance.method(:deinit)) diff --git a/lib/vagrant.rb b/lib/vagrant.rb -index f3dcba0bc..d696bdff8 100644 +index f790039d3..97e67e3b8 100644 --- a/lib/vagrant.rb +++ b/lib/vagrant.rb -@@ -81,7 +81,7 @@ if ENV["VAGRANT_LOG"] && ENV["VAGRANT_LOG"] != "" - # See https://github.com/rest-client/rest-client/issues/34#issuecomment-290858 - # for more information - class VagrantLogger < Log4r::Logger -- def << msg -+ def << (msg) - debug(msg.strip) - end - end +@@ -59,7 +59,7 @@ require "vagrant/plugin/manager" + # See https://github.com/rest-client/rest-client/issues/34#issuecomment-290858 + # for more information + class VagrantLogger < Log4r::Logger +- def << msg ++ def << (msg) + debug(msg.strip) + end + end diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb index eb2caabb0..d75f54362 100644 --- a/lib/vagrant/bundler.rb |