commit: 9d1b53ec3f4077fb6ec0e11b60a461fd3c2baca1 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Tue Jun 28 20:25:08 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Wed Jun 29 07:13:16 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d1b53ec
app-admin/puppet: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/1790 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> app-admin/puppet/files/puppet-fix-tests-4.x.patch | 18 ------------------ app-admin/puppet/files/puppet-openrc-status-fix.patch | 15 --------------- 2 files changed, 33 deletions(-) diff --git a/app-admin/puppet/files/puppet-fix-tests-4.x.patch b/app-admin/puppet/files/puppet-fix-tests-4.x.patch deleted file mode 100644 index 77d9cfb..0000000 --- a/app-admin/puppet/files/puppet-fix-tests-4.x.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- ./spec/unit/network/http/api/indirected_routes_spec.rb 2015-07-21 12:09:09.000000000 -0500 -+++ ./spec/unit/network/http/api/indirected_routes_spec.rb.new 2015-07-23 18:33:22.839914116 -0500 -@@ -144,15 +144,6 @@ - :env)))) - handler.uri2indirection("GET", "#{master_url_prefix}/node/bar", params) - end -- -- it "should not pass through an environment to check_authorization and fail if the environment is unknown" do -- handler.expects(:check_authorization).with(anything, -- anything, -- Not(has_entry(:environment))) -- expect(lambda { handler.uri2indirection("GET", -- "#{master_url_prefix}/node/bar", -- {:environment => 'bogus'}) }).to raise_error(ArgumentError) -- end - end - - describe "when converting a request into a URI" do diff --git a/app-admin/puppet/files/puppet-openrc-status-fix.patch b/app-admin/puppet/files/puppet-openrc-status-fix.patch deleted file mode 100644 index af56809..0000000 --- a/app-admin/puppet/files/puppet-openrc-status-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur puppet-3.1.1-r2.orig/lib/puppet/provider/service/openrc.rb puppet-3.1.1-r2/lib/puppet/provider/service/openrc.rb ---- all/puppet-3.1.1.orig/lib/puppet/provider/service/openrc.rb 2013-06-05 03:32:53.646824966 -0400 -+++ all/puppet-3.1.1/lib/puppet/provider/service/openrc.rb 2013-06-05 03:37:25.333824967 -0400 -@@ -10,8 +10,10 @@ - defaultfor :operatingsystem => :gentoo - defaultfor :operatingsystem => :funtoo - -+ has_command(:rcstatus, '/bin/rc-status') do -+ environment :RC_SVCNAME => nil -+ end - commands :rcservice => '/sbin/rc-service' -- commands :rcstatus => '/bin/rc-status' - commands :rcupdate => '/sbin/rc-update' - - self::STATUSLINE = /^\s+(.*?)\s*\[\s*(.*)\s*\]$/
