From a23b6a0c5828dcaaaf6c424c6251f4c73ee77f1d Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 20 Oct 2015 14:43:09 -0200 Subject: TODO: apply patches --- TODO.md | 2 +- files/patches/puppet-stack-level-trusty.patch | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TODO.md b/TODO.md index 5151b13..250a343 100644 --- a/TODO.md +++ b/TODO.md @@ -22,7 +22,7 @@ High priority - http://andrewbunday.co.uk/2012/12/04/masterless-puppet-wrapper/ - http://semicomplete.com/presentations/puppet-at-loggly/puppet-at-loggly.pdf.html - https://github.com/jordansissel/puppet-examples/tree/master/masterless - - hooks: + - apply patches: - storeconfigs warning patch - https://bugs.launchpad.net/ubuntu/+source/puppet/+bug/1313595 - sshd: diff --git a/files/patches/puppet-stack-level-trusty.patch b/files/patches/puppet-stack-level-trusty.patch index 3521dd9..1d112f7 100644 --- a/files/patches/puppet-stack-level-trusty.patch +++ b/files/patches/puppet-stack-level-trusty.patch @@ -1,8 +1,8 @@ ---- resource.rb.orig 2015-10-19 17:19:13.500193213 -0200 -+++ resource.rb 2015-10-19 17:19:58.972194943 -0200 +--- /usr/lib/ruby/vendor_ruby/puppet/rails/resource.rb.orig 2015-10-19 17:19:13.500193213 -0200 ++++ /usr/lib/ruby/vendor_ruby/puppet/rails/resource.rb 2015-10-19 17:19:58.972194943 -0200 @@ -84,7 +84,11 @@ end - + def [](param) - super || parameter(param) + if param == 'id' @@ -11,5 +11,5 @@ + super || parameter(param) + end end - + # Make sure this resource is equivalent to the provided Parser resource. -- cgit v1.2.3