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