Dan Čermák
35526c91aa
Remove no longer required gem webmock OBS-URL: https://build.opensuse.org/request/show/904407 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=59
159 lines
5.8 KiB
Diff
159 lines
5.8 KiB
Diff
From 5d0d5df6dcb54c5b423cbfa60c7e5eaccce380c9 Mon Sep 17 00:00:00 2001
|
|
From: Johannes Kastl <kastl@b1-systems.de>
|
|
Date: Wed, 17 May 2017 09:09:57 +0200
|
|
Subject: [PATCH 03/15] plugins-don-t-abuse-require_relative.patch
|
|
|
|
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
|
|
---
|
|
plugins/guests/arch/cap/configure_networks.rb | 2 +-
|
|
plugins/guests/debian/cap/configure_networks.rb | 2 +-
|
|
plugins/guests/freebsd/cap/configure_networks.rb | 2 +-
|
|
plugins/guests/funtoo/cap/configure_networks.rb | 2 +-
|
|
plugins/guests/gentoo/cap/configure_networks.rb | 2 +-
|
|
plugins/guests/netbsd/cap/configure_networks.rb | 2 +-
|
|
plugins/guests/nixos/cap/configure_networks.rb | 2 +-
|
|
plugins/guests/openbsd/cap/configure_networks.rb | 2 +-
|
|
plugins/guests/redhat/cap/configure_networks.rb | 2 +-
|
|
plugins/guests/slackware/cap/configure_networks.rb | 2 +-
|
|
plugins/guests/suse/cap/configure_networks.rb | 2 +-
|
|
11 files changed, 11 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/plugins/guests/arch/cap/configure_networks.rb b/plugins/guests/arch/cap/configure_networks.rb
|
|
index 79f14213a..d8966b171 100644
|
|
--- a/plugins/guests/arch/cap/configure_networks.rb
|
|
+++ b/plugins/guests/arch/cap/configure_networks.rb
|
|
@@ -2,7 +2,7 @@ require "ipaddr"
|
|
require "socket"
|
|
require "tempfile"
|
|
|
|
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
|
+require "vagrant/util/template_renderer"
|
|
|
|
module VagrantPlugins
|
|
module GuestArch
|
|
diff --git a/plugins/guests/debian/cap/configure_networks.rb b/plugins/guests/debian/cap/configure_networks.rb
|
|
index dfec32ccb..6b56e280a 100644
|
|
--- a/plugins/guests/debian/cap/configure_networks.rb
|
|
+++ b/plugins/guests/debian/cap/configure_networks.rb
|
|
@@ -1,6 +1,6 @@
|
|
require "tempfile"
|
|
|
|
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
|
+require "vagrant/util/template_renderer"
|
|
|
|
module VagrantPlugins
|
|
module GuestDebian
|
|
diff --git a/plugins/guests/freebsd/cap/configure_networks.rb b/plugins/guests/freebsd/cap/configure_networks.rb
|
|
index 5020eebe8..1778f94c4 100644
|
|
--- a/plugins/guests/freebsd/cap/configure_networks.rb
|
|
+++ b/plugins/guests/freebsd/cap/configure_networks.rb
|
|
@@ -1,6 +1,6 @@
|
|
require "tempfile"
|
|
|
|
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
|
+require "vagrant/util/template_renderer"
|
|
|
|
module VagrantPlugins
|
|
module GuestFreeBSD
|
|
diff --git a/plugins/guests/funtoo/cap/configure_networks.rb b/plugins/guests/funtoo/cap/configure_networks.rb
|
|
index 6e20dc237..1b41340c1 100644
|
|
--- a/plugins/guests/funtoo/cap/configure_networks.rb
|
|
+++ b/plugins/guests/funtoo/cap/configure_networks.rb
|
|
@@ -1,6 +1,6 @@
|
|
require "tempfile"
|
|
|
|
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
|
+require "vagrant/util/template_renderer"
|
|
|
|
module VagrantPlugins
|
|
module GuestFuntoo
|
|
diff --git a/plugins/guests/gentoo/cap/configure_networks.rb b/plugins/guests/gentoo/cap/configure_networks.rb
|
|
index f7464432c..002271b71 100644
|
|
--- a/plugins/guests/gentoo/cap/configure_networks.rb
|
|
+++ b/plugins/guests/gentoo/cap/configure_networks.rb
|
|
@@ -1,7 +1,7 @@
|
|
require "tempfile"
|
|
require "ipaddr"
|
|
|
|
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
|
+require "vagrant/util/template_renderer"
|
|
|
|
module VagrantPlugins
|
|
module GuestGentoo
|
|
diff --git a/plugins/guests/netbsd/cap/configure_networks.rb b/plugins/guests/netbsd/cap/configure_networks.rb
|
|
index d53b6c6e4..922edfdab 100644
|
|
--- a/plugins/guests/netbsd/cap/configure_networks.rb
|
|
+++ b/plugins/guests/netbsd/cap/configure_networks.rb
|
|
@@ -1,6 +1,6 @@
|
|
require "tempfile"
|
|
|
|
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
|
+require "vagrant/util/template_renderer"
|
|
|
|
module VagrantPlugins
|
|
module GuestNetBSD
|
|
diff --git a/plugins/guests/nixos/cap/configure_networks.rb b/plugins/guests/nixos/cap/configure_networks.rb
|
|
index 96458622f..ed371765e 100644
|
|
--- a/plugins/guests/nixos/cap/configure_networks.rb
|
|
+++ b/plugins/guests/nixos/cap/configure_networks.rb
|
|
@@ -1,7 +1,7 @@
|
|
require "ipaddr"
|
|
require "tempfile"
|
|
|
|
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
|
+require "vagrant/util/template_renderer"
|
|
|
|
module VagrantPlugins
|
|
module GuestNixos
|
|
diff --git a/plugins/guests/openbsd/cap/configure_networks.rb b/plugins/guests/openbsd/cap/configure_networks.rb
|
|
index fefc05b9e..a3bfcaf48 100644
|
|
--- a/plugins/guests/openbsd/cap/configure_networks.rb
|
|
+++ b/plugins/guests/openbsd/cap/configure_networks.rb
|
|
@@ -1,6 +1,6 @@
|
|
require "tempfile"
|
|
|
|
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
|
+require "vagrant/util/template_renderer"
|
|
|
|
module VagrantPlugins
|
|
module GuestOpenBSD
|
|
diff --git a/plugins/guests/redhat/cap/configure_networks.rb b/plugins/guests/redhat/cap/configure_networks.rb
|
|
index c618c8e53..31ba4f315 100644
|
|
--- a/plugins/guests/redhat/cap/configure_networks.rb
|
|
+++ b/plugins/guests/redhat/cap/configure_networks.rb
|
|
@@ -1,6 +1,6 @@
|
|
require "tempfile"
|
|
|
|
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
|
+require "vagrant/util/template_renderer"
|
|
|
|
module VagrantPlugins
|
|
module GuestRedHat
|
|
diff --git a/plugins/guests/slackware/cap/configure_networks.rb b/plugins/guests/slackware/cap/configure_networks.rb
|
|
index b11b93e98..0f180275f 100644
|
|
--- a/plugins/guests/slackware/cap/configure_networks.rb
|
|
+++ b/plugins/guests/slackware/cap/configure_networks.rb
|
|
@@ -1,6 +1,6 @@
|
|
require "tempfile"
|
|
|
|
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
|
+require "vagrant/util/template_renderer"
|
|
|
|
module VagrantPlugins
|
|
module GuestSlackware
|
|
diff --git a/plugins/guests/suse/cap/configure_networks.rb b/plugins/guests/suse/cap/configure_networks.rb
|
|
index 2dd140230..e6dd96f08 100644
|
|
--- a/plugins/guests/suse/cap/configure_networks.rb
|
|
+++ b/plugins/guests/suse/cap/configure_networks.rb
|
|
@@ -1,6 +1,6 @@
|
|
require "tempfile"
|
|
|
|
-require_relative "../../../../lib/vagrant/util/template_renderer"
|
|
+require "vagrant/util/template_renderer"
|
|
|
|
module VagrantPlugins
|
|
module GuestSUSE
|
|
--
|
|
2.31.1
|
|
|