Attachment 192305 Details for Bug 227341 – Patch to change default config location and change maintainer

[patch] Patch to change default config location and change maintainer

rubygem-r10k.patch (text/plain), 1.86 KB, created by Romain Tartière on 2018-04-07 11:37:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Romain Tartière

Created: 2018-04-07 11:37:04 UTC

Size: 1.86 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(rÃ©vision 466718)
>+++ Makefile	(copie de travail)
>@@ -2,10 +2,11 @@
> 
> PORTNAME=	r10k
> PORTVERSION=	2.6.2
>+PORTREVISION=	1
> CATEGORIES=	sysutils rubygems
> MASTER_SITES=	RG
> 
>-MAINTAINER=	ruby@FreeBSD.org
>+MAINTAINER=	puppet@FreeBSD.org
> COMMENT=	Tool for deploying Puppet environments and modules
> 
> LICENSE=	APACHE20
>Index: files/patch-lib_r10k_settings_loader.rb
>===================================================================
>--- files/patch-lib_r10k_settings_loader.rb	(nonexistent)
>+++ files/patch-lib_r10k_settings_loader.rb	(copie de travail)
>@@ -0,0 +1,24 @@
>+--- lib/r10k/settings/loader.rb.orig	2018-04-07 11:13:36 UTC
>++++ lib/r10k/settings/loader.rb
>+@@ -8,8 +8,8 @@ module R10K
>+     #
>+     # r10k.yaml is checked for in the following locations:
>+     #   - $PWD/r10k.yaml
>+-    #   - /etc/puppetlabs/r10k/r10k.yaml
>+-    #   - /etc/r10k.yaml
>++    #   - /usr/local/etc/r10k/r10k.yaml
>++    #   - /usr/local/etc/r10k.yaml
>+     class Loader
>+ 
>+       def self.search(override = nil)
>+@@ -21,8 +21,8 @@ module R10K
>+       attr_reader :loadpath
>+ 
>+       CONFIG_FILE = 'r10k.yaml'
>+-      DEFAULT_LOCATION = File.join('/etc/puppetlabs/r10k', CONFIG_FILE)
>+-      OLD_DEFAULT_LOCATION = File.join('/etc', CONFIG_FILE)
>++      DEFAULT_LOCATION = File.join('/usr/local/etc/r10k', CONFIG_FILE)
>++      OLD_DEFAULT_LOCATION = File.join('/usr/local/etc', CONFIG_FILE)
>+ 
>+       def initialize
>+         @loadpath = []
>
>Modification de propriÃ©tÃ©s sur files/patch-lib_r10k_settings_loader.rb
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 227341: 192305