fix ruby 2.2 warning; spotted by sebastia@

This commit is contained in:
jasper 2015-07-24 18:19:36 +00:00
parent ef2940c5f0
commit 752b039ce5
2 changed files with 20 additions and 6 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.115 2015/07/18 15:46:11 jeremy Exp $
# $OpenBSD: Makefile,v 1.116 2015/07/24 18:19:36 jasper Exp $
PORTROACH= limit:^3
VERSION= 3.8.1
REVISION= 4
REVISION= 5
RUN_DEPENDS+= archivers/gtar \
devel/ruby-rgen,${MODRUBY_FLAVOR}

View File

@ -1,7 +1,21 @@
$OpenBSD: patch-lib_puppet_defaults_rb,v 1.13 2015/06/01 06:41:00 jasper Exp $
$OpenBSD: patch-lib_puppet_defaults_rb,v 1.14 2015/07/24 18:19:36 jasper Exp $
https://github.com/puppetlabs/puppet/pull/4102
--- lib/puppet/defaults.rb.orig Thu May 21 22:54:42 2015
+++ lib/puppet/defaults.rb Sat May 30 10:45:38 2015
@@ -1044,11 +1044,11 @@ EOT
+++ lib/puppet/defaults.rb Fri Jul 24 20:16:34 2015
@@ -486,10 +486,6 @@ module Puppet
:default => "stomp",
:desc => "Which type of queue to use for asynchronous processing.",
},
- :queue_type => {
- :default => "stomp",
- :desc => "Which type of queue to use for asynchronous processing.",
- },
:queue_source => {
:default => "stomp://localhost:61613/",
:desc => "Which type of queue to use for asynchronous processing. If your stomp server requires
@@ -1044,11 +1040,11 @@ EOT
define_settings(:master,
:user => {
@ -15,7 +29,7 @@ $OpenBSD: patch-lib_puppet_defaults_rb,v 1.13 2015/06/01 06:41:00 jasper Exp $
:desc => "The group puppet master should run as.",
},
:manifestdir => {
@@ -1171,7 +1171,7 @@ EOT
@@ -1171,7 +1167,7 @@ EOT
:desc => "Whether the master should function as a certificate authority.",
},
:basemodulepath => {