|
|
8185bb5 |
diff '--color=auto' -Naur /var/lib/mock/fedora-rawhide-x86_64/root/builddir/build/BUILDROOT/vagrant-2.3.4-1.fc39.x86_64/usr/share/vagrant/gems/gems/vagrant-2.3.4/lib/vagrant.rb /var/lib/mock/vagrant-rebase/root/builddir/build/BUILDROOT/vagrant-2.3.4-1.fc39.x86_64/usr/share/vagrant/gems/gems/vagrant-2.3.4/lib/vagrant.rb
|
|
|
8185bb5 |
--- /var/lib/mock/fedora-rawhide-x86_64/root/builddir/build/BUILDROOT/vagrant-2.3.4-1.fc39.x86_64/usr/share/vagrant/gems/gems/vagrant-2.3.4/lib/vagrant.rb 2023-02-16 13:41:49.267357857 +0100
|
|
|
8185bb5 |
+++ /var/lib/mock/vagrant-rebase/root/builddir/build/BUILDROOT/vagrant-2.3.4-1.fc39.x86_64/usr/share/vagrant/gems/gems/vagrant-2.3.4/lib/vagrant.rb 2023-03-17 16:47:49.956035219 +0100
|
|
|
8185bb5 |
@@ -46,19 +46,19 @@
|
|
|
8185bb5 |
require "vagrant/plugin/manager"
|
|
|
8185bb5 |
|
|
|
8185bb5 |
# Update the load path so our protos can be located
|
|
|
8185bb5 |
-$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs").to_s
|
|
|
8185bb5 |
-$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto").to_s
|
|
|
8185bb5 |
-$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto/vagrant_plugin_sdk").to_s
|
|
|
8185bb5 |
+# $LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs").to_s
|
|
|
8185bb5 |
+# $LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto").to_s
|
|
|
8185bb5 |
+# $LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto/vagrant_plugin_sdk").to_s
|
|
|
8185bb5 |
|
|
|
8185bb5 |
# Load our protos so they are available
|
|
|
8185bb5 |
-require 'vagrant/protobufs/proto/vagrant_server/server_pb'
|
|
|
8185bb5 |
-require 'vagrant/protobufs/proto/vagrant_server/server_services_pb'
|
|
|
8185bb5 |
-require 'vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb'
|
|
|
8185bb5 |
-require 'vagrant/protobufs/proto/ruby_vagrant/ruby-server_services_pb'
|
|
|
8185bb5 |
-require 'vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb'
|
|
|
8185bb5 |
-require 'vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb'
|
|
|
8185bb5 |
-require 'vagrant/protobufs/proto/plugin/grpc_broker_pb'
|
|
|
8185bb5 |
-require 'vagrant/protobufs/proto/plugin/grpc_broker_services_pb'
|
|
|
8185bb5 |
+# require 'vagrant/protobufs/proto/vagrant_server/server_pb'
|
|
|
8185bb5 |
+# require 'vagrant/protobufs/proto/vagrant_server/server_services_pb'
|
|
|
8185bb5 |
+# require 'vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb'
|
|
|
8185bb5 |
+# require 'vagrant/protobufs/proto/ruby_vagrant/ruby-server_services_pb'
|
|
|
8185bb5 |
+# require 'vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb'
|
|
|
8185bb5 |
+# require 'vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb'
|
|
|
8185bb5 |
+# require 'vagrant/protobufs/proto/plugin/grpc_broker_pb'
|
|
|
8185bb5 |
+# require 'vagrant/protobufs/proto/plugin/grpc_broker_services_pb'
|
|
|
8185bb5 |
|
|
|
8185bb5 |
# Enable logging if it is requested. We do this before
|
|
|
8185bb5 |
# anything else so that we can setup the output before
|
|
|
8185bb5 |
diff '--color=auto' -Naur /var/lib/mock/fedora-rawhide-x86_64/root/builddir/build/BUILDROOT/vagrant-2.3.4-1.fc39.x86_64/usr/share/vagrant/gems/gems/vagrant-2.3.4/plugins/commands/serve/command.rb /var/lib/mock/vagrant-rebase/root/builddir/build/BUILDROOT/vagrant-2.3.4-1.fc39.x86_64/usr/share/vagrant/gems/gems/vagrant-2.3.4/plugins/commands/serve/command.rb
|
|
|
8185bb5 |
--- /var/lib/mock/fedora-rawhide-x86_64/root/builddir/build/BUILDROOT/vagrant-2.3.4-1.fc39.x86_64/usr/share/vagrant/gems/gems/vagrant-2.3.4/plugins/commands/serve/command.rb 2023-02-16 13:41:49.358357676 +0100
|
|
|
8185bb5 |
+++ /var/lib/mock/vagrant-rebase/root/builddir/build/BUILDROOT/vagrant-2.3.4-1.fc39.x86_64/usr/share/vagrant/gems/gems/vagrant-2.3.4/plugins/commands/serve/command.rb 2023-03-17 16:57:02.859959067 +0100
|
|
|
8185bb5 |
@@ -3,9 +3,9 @@
|
|
|
8185bb5 |
module VagrantPlugins
|
|
|
8185bb5 |
module CommandServe
|
|
|
8185bb5 |
# Simple constant aliases to reduce namespace typing
|
|
|
8185bb5 |
- SDK = Hashicorp::Vagrant::Sdk
|
|
|
8185bb5 |
- SRV = Hashicorp::Vagrant
|
|
|
8185bb5 |
- Empty = ::Google::Protobuf::Empty
|
|
|
8185bb5 |
+ # SDK = Hashicorp::Vagrant::Sdk
|
|
|
8185bb5 |
+ # SRV = Hashicorp::Vagrant
|
|
|
8185bb5 |
+ Empty = []
|
|
|
8185bb5 |
|
|
|
8185bb5 |
autoload :Broker, Vagrant.source_root.join("plugins/commands/serve/broker").to_s
|
|
|
8185bb5 |
autoload :Client, Vagrant.source_root.join("plugins/commands/serve/client").to_s
|
|
|
8185bb5 |
diff '--color=auto' -Naur /var/lib/mock/fedora-rawhide-x86_64/root/builddir/build/BUILDROOT/vagrant-2.3.4-1.fc39.x86_64/usr/share/vagrant/gems/gems/vagrant-2.3.4/plugins/kernel_v2/config/vm.rb /var/lib/mock/vagrant-rebase/root/builddir/build/BUILDROOT/vagrant-2.3.4-1.fc39.x86_64/usr/share/vagrant/gems/gems/vagrant-2.3.4/plugins/kernel_v2/config/vm.rb
|
|
|
8185bb5 |
--- /var/lib/mock/fedora-rawhide-x86_64/root/builddir/build/BUILDROOT/vagrant-2.3.4-1.fc39.x86_64/usr/share/vagrant/gems/gems/vagrant-2.3.4/plugins/kernel_v2/config/vm.rb 2023-02-16 13:41:49.475357444 +0100
|
|
|
8185bb5 |
+++ /var/lib/mock/vagrant-rebase/root/builddir/build/BUILDROOT/vagrant-2.3.4-1.fc39.x86_64/usr/share/vagrant/gems/gems/vagrant-2.3.4/plugins/kernel_v2/config/vm.rb 2023-03-17 16:48:26.940189713 +0100
|
|
|
8185bb5 |
@@ -11,11 +11,11 @@
|
|
|
8185bb5 |
require "vagrant/util/map_command_options"
|
|
|
8185bb5 |
require "vagrant/util/map_command_options"
|
|
|
8185bb5 |
|
|
|
8185bb5 |
-$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto").to_s
|
|
|
8185bb5 |
-
|
|
|
8185bb5 |
-require "vagrant/protobufs/proto/protostructure_pb"
|
|
|
8185bb5 |
-require "vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb"
|
|
|
8185bb5 |
-require "vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb"
|
|
|
8185bb5 |
+# $LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto").to_s
|
|
|
8185bb5 |
+#
|
|
|
8185bb5 |
+# require "vagrant/protobufs/proto/protostructure_pb"
|
|
|
8185bb5 |
+# require "vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb"
|
|
|
8185bb5 |
+# require "vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb"
|
|
|
8185bb5 |
|
|
|
8185bb5 |
# Include mappers
|
|
|
8185bb5 |
require Vagrant.source_root.join("plugins/commands/serve/command").to_s
|