commit 4d0de6104618256335440a0cc43eb41851940089
Author: Elan Ruusamäe <[email protected]>
Date: Thu Mar 13 07:37:36 2014 +0200
up to 1.5.0
no-warning.patch | 22 ++++++++++++----------
source_root.patch | 12 ++++++------
vagrant.spec | 4 ++--
3 files changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/vagrant.spec b/vagrant.spec
index 51fb417..7a7e17a 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -2,12 +2,12 @@
# - release notes:
https://github.com/mitchellh/vagrant/blob/master/CHANGELOG.md
Summary: Provisioning and deployment of virtual instances
Name: vagrant
-Version: 1.4.3
+Version: 1.5.0
Release: 1
License: MIT
Group: Applications/Emulators
Source0:
https://github.com/mitchellh/vagrant/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 645994e13b1e208e7bb04334cdbdbec7
+# Source0-md5: fa927affdee693d5701f3174d8911587
Patch0: source_root.patch
Patch1: rubygems.patch
Patch2: no-warning.patch
diff --git a/no-warning.patch b/no-warning.patch
index 08d1d35..799ba2f 100644
--- a/no-warning.patch
+++ b/no-warning.patch
@@ -1,12 +1,14 @@
---- vagrant-1.2.1/bin/vagrant
-+++ vagrant-1.2.1/bin/vagrant
-@@ -74,9 +74,6 @@
- warned = true
- end
- end
--
-- # If we're not in the installer, warn.
-- env.ui.warn(I18n.t("vagrant.general.not_in_installer")) if !warned
- end
+--- vagrant-1.5.0/bin/vagrant~ 2014-03-10 07:50:03.000000000 +0200
++++ vagrant-1.5.0/bin/vagrant 2014-03-13 07:17:05.591081469 +0200
+@@ -137,11 +137,6 @@
+ logger.debug("Creating Vagrant environment")
+ env = Vagrant::Environment.new(opts)
+- if !Vagrant.in_installer?
+- # If we're not in the installer, warn.
+- env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix:
false)
+- end
+-
begin
+ # Execute the CLI interface, and exit with the proper error code
+ exit_status = env.cli(argv)
diff --git a/source_root.patch b/source_root.patch
index e715b24..f64fad2 100644
--- a/source_root.patch
+++ b/source_root.patch
@@ -1,10 +1,10 @@
---- vagrant-1.2.1/lib/vagrant.rb~ 2013-04-17 07:29:18.000000000 +0300
-+++ vagrant-1.2.1/lib/vagrant.rb 2013-04-21 01:34:14.000000000 +0300
-@@ -114,6 +114,7 @@
- # The source root is the path to the root directory of
- # the Vagrant gem.
+--- vagrant-1.5.0/lib/vagrant/shared_helpers.rb~ 2014-03-10
07:50:03.000000000 +0200
++++ vagrant-1.5.0/lib/vagrant/shared_helpers.rb 2014-03-13
07:15:33.997139002 +0200
+@@ -45,6 +45,7 @@
+ #
+ # @return [Pathname]
def self.source_root
+ @source_root ||= Pathname.new('/usr/share/vagrant')
- @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
+ @source_root ||= Pathname.new(File.expand_path('../../../', __FILE__))
end
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vagrant.git/commitdiff/cec5282a3ca35b3ea683a59621d73b739f3f9b72
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
