rpm/vagrant
SHA256
1
0
Fork 0
forked from pool/vagrant
Code Pull Requests Activity
37a0d38144
vagrant/0009-plugins-don-t-abuse-require_relative.patch

159 lines
5.8 KiB
Diff
Raw Normal View History

Accepting request 649962 from home:ojkastl_buildservice:Branch_Virtualization_vagrant update to 2.1.3; removed patch 0007-Support-system-installed-plugins.patch; removed patch 0027-now-use-rubygem-net-ssh-5.0.x.patch OBS-URL: https://build.opensuse.org/request/show/649962 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=19
2018-11-17 21:30:13 +01:00
From ad2b9cb36e1a8078be140ca6d2f852a91e97fd1c Mon Sep 17 00:00:00 2001
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
From: Johannes Kastl <kastl@b1-systems.de>
Date: Wed, 17 May 2017 09:09:57 +0200
Subject: [PATCH] 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(-)
Accepting request 477690 from Virtualization 1 OBS-URL: https://build.opensuse.org/request/show/477690 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=2
2017-03-12 20:03:16 +01:00
diff --git a/plugins/guests/arch/cap/configure_networks.rb b/plugins/guests/arch/cap/configure_networks.rb
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
index 0ef71d55f..df0bd0f8f 100644
Accepting request 477690 from Virtualization 1 OBS-URL: https://build.opensuse.org/request/show/477690 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=2
2017-03-12 20:03:16 +01:00
--- 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
Accepting request 649962 from home:ojkastl_buildservice:Branch_Virtualization_vagrant update to 2.1.3; removed patch 0007-Support-system-installed-plugins.patch; removed patch 0027-now-use-rubygem-net-ssh-5.0.x.patch OBS-URL: https://build.opensuse.org/request/show/649962 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=19
2018-11-17 21:30:13 +01:00
index 35ffba2d2..c09c59518 100644
Accepting request 477690 from Virtualization 1 OBS-URL: https://build.opensuse.org/request/show/477690 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=2
2017-03-12 20:03:16 +01:00
--- 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
Accepting request 649962 from home:ojkastl_buildservice:Branch_Virtualization_vagrant update to 2.1.3; removed patch 0007-Support-system-installed-plugins.patch; removed patch 0027-now-use-rubygem-net-ssh-5.0.x.patch OBS-URL: https://build.opensuse.org/request/show/649962 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=19
2018-11-17 21:30:13 +01:00
index 36b11d1ed..866f8503a 100644
Accepting request 477690 from Virtualization 1 OBS-URL: https://build.opensuse.org/request/show/477690 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=2
2017-03-12 20:03:16 +01:00
--- 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
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
index 6e20dc237..1b41340c1 100644
Accepting request 477690 from Virtualization 1 OBS-URL: https://build.opensuse.org/request/show/477690 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=2
2017-03-12 20:03:16 +01:00
--- 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
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
index f7464432c..002271b71 100644
Accepting request 477690 from Virtualization 1 OBS-URL: https://build.opensuse.org/request/show/477690 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=2
2017-03-12 20:03:16 +01:00
--- a/plugins/guests/gentoo/cap/configure_networks.rb
+++ b/plugins/guests/gentoo/cap/configure_networks.rb
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
@@ -1,7 +1,7 @@
Accepting request 477690 from Virtualization 1 OBS-URL: https://build.opensuse.org/request/show/477690 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=2
2017-03-12 20:03:16 +01:00
require "tempfile"
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
require "ipaddr"
Accepting request 477690 from Virtualization 1 OBS-URL: https://build.opensuse.org/request/show/477690 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=2
2017-03-12 20:03:16 +01:00
-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
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
index d53b6c6e4..922edfdab 100644
Accepting request 477690 from Virtualization 1 OBS-URL: https://build.opensuse.org/request/show/477690 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=2
2017-03-12 20:03:16 +01:00
--- 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
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
index 96458622f..ed371765e 100644
Accepting request 477690 from Virtualization 1 OBS-URL: https://build.opensuse.org/request/show/477690 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=2
2017-03-12 20:03:16 +01:00
--- 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
Accepting request 649962 from home:ojkastl_buildservice:Branch_Virtualization_vagrant update to 2.1.3; removed patch 0007-Support-system-installed-plugins.patch; removed patch 0027-now-use-rubygem-net-ssh-5.0.x.patch OBS-URL: https://build.opensuse.org/request/show/649962 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=19
2018-11-17 21:30:13 +01:00
index fefc05b9e..a3bfcaf48 100644
Accepting request 477690 from Virtualization 1 OBS-URL: https://build.opensuse.org/request/show/477690 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=2
2017-03-12 20:03:16 +01:00
--- 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
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
index 44fa5fa67..58ac7a31c 100644
Accepting request 477690 from Virtualization 1 OBS-URL: https://build.opensuse.org/request/show/477690 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=2
2017-03-12 20:03:16 +01:00
--- 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
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
index b11b93e98..0f180275f 100644
Accepting request 477690 from Virtualization 1 OBS-URL: https://build.opensuse.org/request/show/477690 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=2
2017-03-12 20:03:16 +01:00
--- 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
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
index 2dd140230..e6dd96f08 100644
Accepting request 477690 from Virtualization 1 OBS-URL: https://build.opensuse.org/request/show/477690 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=2
2017-03-12 20:03:16 +01:00
--- 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
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
--
Accepting request 649962 from home:ojkastl_buildservice:Branch_Virtualization_vagrant update to 2.1.3; removed patch 0007-Support-system-installed-plugins.patch; removed patch 0027-now-use-rubygem-net-ssh-5.0.x.patch OBS-URL: https://build.opensuse.org/request/show/649962 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=19
2018-11-17 21:30:13 +01:00
2.19.1
Accepting request 519591 from Virtualization fixed boo#1044087; removed wdm dependency; prevent 'have choice' for rubygem-addressable OBS-URL: https://build.opensuse.org/request/show/519591 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=3
2017-08-31 21:03:29 +02:00
Copy Permalink