[vagrant/f21] Fix Puppet provisioning error available in 1.7.2 re-release.

[Michael Adam]

commit 2c8cb6355a315229de65778c9883d2e07e0d852d
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Fri Feb 20 13:36:05 2015 +0100

    Fix Puppet provisioning error available in 1.7.2 re-release.
    
    (cherry picked from commit 2b3ea0121b0cab0de54faf59ac318c7a0c94d251)

 ...rs-puppet-fix-exception-with-module-paths.patch | 23 ++++++++++++++++++++++
 vagrant.spec                                       | 10 +++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
---
diff --git a/vagrant-1.7.2-provisioners-puppet-fix-exception-with-module-paths.patch b/vagrant-1.7.2-provisioners-puppet-fix-exception-with-module-paths.patch
new file mode 100644
index 0000000..c241b8e
--- /dev/null
+++ b/vagrant-1.7.2-provisioners-puppet-fix-exception-with-module-paths.patch
@@ -0,0 +1,23 @@
+From 95e1c19f225ef8fc14c958f7f2bdf6c29691817a Mon Sep 17 00:00:00 2001
+From: Mitchell Hashimoto <mitchell.hashimoto at gmail.com>
+Date: Tue, 6 Jan 2015 22:49:53 -0800
+Subject: [PATCH] provisioners/puppet: fix exception with module paths
+ [GH-5123]
+
+---
+ plugins/provisioners/puppet/provisioner/puppet.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
+index 4953404..c1e01c9 100644
+--- a/plugins/provisioners/puppet/provisioner/puppet.rb
++++ b/plugins/provisioners/puppet/provisioner/puppet.rb
+@@ -25,7 +25,7 @@ def configure(root_config)
+           # Setup the module paths
+           @module_paths = []
+           @expanded_module_paths.each_with_index do |path, _|
+-            key = Digest::MD5.hexdigest(path)
++            key = Digest::MD5.hexdigest(path.to_s)
+             @module_paths << [path, File.join(config.temp_dir, "modules-#{key}")]
+           end
+ 
diff --git a/vagrant.spec b/vagrant.spec
index 74ca51c..07cb598 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -4,7 +4,7 @@
 
 Name: vagrant
 Version: 1.7.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Build and distribute virtualized development environments
 Group: Development/Languages
 License: MIT
@@ -26,6 +26,10 @@ Source4: macros.vagrant
 
 Patch0: vagrant-1.7.2-fix-dependencies.patch
 
+# Fix Puppet provisioning error.
+# https://github.com/mitchellh/vagrant/issues/5123
+Patch1: vagrant-1.7.2-provisioners-puppet-fix-exception-with-module-paths.patch
+
 Requires: ruby(release)
 Requires: ruby(rubygems) >= 1.3.6
 # Explicitly specify MRI, since Vagrant does not work with JRuby ATM.
@@ -88,6 +92,7 @@ Documentation for %{name}.
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -217,6 +222,9 @@ getent group vagrant >/dev/null || groupadd -r vagrant
 
 
 %changelog
+* Fri Feb 20 2015 Vít Ondruch <vondruch at redhat.com> - 1.7.2-3
+- Fix Puppet provisioning error available in 1.7.2 re-release.
+
 * Fri Feb 20 2015 Michael Adam <madam at redhat.com> - 1.7.2-2
 - Add missing dependencies.