| 1 |
commit: 3d0d39b70b8a5f544224f9b8fbae680808ad8122 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 20 08:17:57 2019 +0000 |
| 4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 20 08:18:54 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d0d39b7 |
| 7 |
|
| 8 |
app-admin/puppet: fix patch for puppet 6.4.1 |
| 9 |
|
| 10 |
Fixes: https://bugs.gentoo.org/683836 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 13 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
| 14 |
|
| 15 |
app-admin/puppet/files/puppet-fix-tests-6.4.1.patch | 18 ++++++++++++++++++ |
| 16 |
app-admin/puppet/puppet-6.4.1.ebuild | 2 +- |
| 17 |
2 files changed, 19 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch b/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..6b7b5b48479 |
| 22 |
--- /dev/null |
| 23 |
+++ b/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch |
| 24 |
@@ -0,0 +1,18 @@ |
| 25 |
+--- spec/unit/network/http/api/indirected_routes_spec.rb 2018-09-17 19:36:56.000000000 -0500 |
| 26 |
++++ spec/unit/network/http/api/indirected_routes_spec.rb 2018-09-19 10:52:35.841614932 -0500 |
| 27 |
+@@ -144,15 +144,6 @@ |
| 28 |
+ handler.uri2indirection("GET", uri_escaped, params) |
| 29 |
+ end |
| 30 |
+ |
| 31 |
+- it "when the environment is unknown should remove :environment from params passed to check_authorization and therefore fail" do |
| 32 |
+- expect(handler).to receive(:check_authorization).with(anything, |
| 33 |
+- anything, |
| 34 |
+- excluding(:environment)) |
| 35 |
+- expect(lambda { handler.uri2indirection("GET", |
| 36 |
+- "#{master_url_prefix}/node/bar", |
| 37 |
+- {:environment => 'bogus'}) }).to raise_error(not_found_error) |
| 38 |
+- end |
| 39 |
+- |
| 40 |
+ it "should not URI unescape the indirection key as passed through to a call to check_authorization" do |
| 41 |
+ expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env)))) |
| 42 |
+ |
| 43 |
|
| 44 |
diff --git a/app-admin/puppet/puppet-6.4.1.ebuild b/app-admin/puppet/puppet-6.4.1.ebuild |
| 45 |
index 1d12aee25d2..0fa5d710120 100644 |
| 46 |
--- a/app-admin/puppet/puppet-6.4.1.ebuild |
| 47 |
+++ b/app-admin/puppet/puppet-6.4.1.ebuild |
| 48 |
@@ -67,7 +67,7 @@ all_ruby_prepare() { |
| 49 |
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die |
| 50 |
|
| 51 |
# can't be run within portage. |
| 52 |
- epatch "${FILESDIR}/puppet-fix-tests-6.0.0.patch" |
| 53 |
+ epatch "${FILESDIR}/puppet-fix-tests-6.4.1.patch" |
| 54 |
|
| 55 |
# fix systemd path |
| 56 |
epatch "${FILESDIR}/puppet-systemd.patch" |
Archives