Fix errors with Puppet4 (patch from Lukas Bezdicka)

epel9
Haikel Guemar 10 years ago
parent 264cca80bd
commit 22a16d50ad

@ -0,0 +1,26 @@
From 376cbbe7cf344f395087dfb04c509bff47b105a2 Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar@fedoraproject.org>
Date: Mon, 18 May 2015 19:48:04 +0200
Subject: [PATCH] Fix errors with Puppet 4
Patch provided by Lukas Bezdicka
---
lib/hiera/config.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/hiera/config.rb b/lib/hiera/config.rb
index d29da7d..fe854cb 100644
--- a/lib/hiera/config.rb
+++ b/lib/hiera/config.rb
@@ -67,7 +67,7 @@ class Hiera::Config
#
# @return [Object] return value of {YAML.load_file}
def yaml_load_file(source)
- YAML.load_file(source)
+ YAML.unsafe_load_file(source)
end
private :yaml_load_file
--
2.4.0

@ -12,13 +12,14 @@
Name: hiera
Version: 1.3.4
Release: 1%{?dist}
Release: 2%{?dist}
Summary: A simple hierarchical database supporting plugin data sources
Group: System Environment/Base
License: ASL 2.0
URL: http://projects.puppetlabs.com/projects/%{name}/
Source0: http://downloads.puppetlabs.com/hiera/%{name}-%{version}.tar.gz
Patch0: 0001-Fix-errors-with-Puppet-4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
%if 0%{?with_checks}
@ -42,6 +43,7 @@ A simple hierarchical database supporting plugin data sources.
%prep
%setup -q
%patch0 -p1 -b .puppet4
%build
# Nothing to build
@ -76,6 +78,9 @@ rm -rf %{buildroot}
%changelog
* Mon May 18 2015 Haïkel Guémar <hguemar@fedoraproject.org> - 1.3.4-2
- Fix errors with Puppet4 (patch from Lukas Bezdicka)
* Wed Jun 11 2014 Steve Traylen <steve.traylen@cern.ch> - 1.3.4-1
- New version 1.3.4

Loading…
Cancel
Save