Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 8 Nov 2013 18:13:40 GMT
From:      Tim Bishop <tim@bishnet.net>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        swills@FreeBSD.org
Subject:   ports/183794: [PATCH] sysutils/puppet: Apply fix for Puppet issue #9290
Message-ID:  <201311081813.rA8IDePV009462@aberfal.kent.ac.uk>
Resent-Message-ID: <201311081820.rA8IK12P035378@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         183794
>Category:       ports
>Synopsis:       [PATCH] sysutils/puppet: Apply fix for Puppet issue #9290
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 08 18:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Tim Bishop
>Release:        FreeBSD 9.2-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD aberfal.kent.ac.uk 9.2-PRERELEASE FreeBSD 9.2-PRERELEASE #40 r255457: Wed Sep 11 01:32:58 BST
>Description:
Apply the resource-fix.diff from the Puppet issue #9290.

https://projects.puppetlabs.com/issues/9290

I've been using this patch locally on Puppet for a long time, and have
been testing it with this latest version for a couple of weeks.

Port maintainer (swills@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_9 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- puppet-3.3.1_3.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 333251)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	3.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 
Index: files/patch-lib__puppet__rails__resource.rb
===================================================================
--- files/patch-lib__puppet__rails__resource.rb	(revision 0)
+++ files/patch-lib__puppet__rails__resource.rb	(working copy)
@@ -0,0 +1,15 @@
+--- ./lib/puppet/rails/resource.rb.orig	2013-11-08 17:42:16.417643102 +0000
++++ ./lib/puppet/rails/resource.rb	2013-11-08 17:42:33.016312322 +0000
+@@ -84,7 +84,11 @@
+   end
+ 
+   def [](param)
+-    super || parameter(param)
++    if param == 'id'
++      super
++    else
++      super || parameter(param)
++    end
+   end
+ 
+   # Make sure this resource is equivalent to the provided Parser resource.

--- puppet-3.3.1_3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311081813.rA8IDePV009462>