TODO: apply patches

diff --git a/TODO.md b/TODO.md
index 5151b1387b6993f67feb7d255d42b02394265bb9..250a343842d1071455d56f6440e0deaafd1afc0a 100644 (file)
--- 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 3521dd99c82d576d393b641caff13496b957ccce..1d112f77ddf44809672b9d41bd29993eada03c77 100644 (file)
--- 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.