1 |
commit: bd4f066f122c32363a6eaefdf73e9e5d851e2cfa |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Feb 4 08:31:44 2018 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 5 00:13:57 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd4f066f |
7 |
|
8 |
dev-ruby/facter: remove unused patch |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/7046 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
.../facter/files/is-integer_fact-1624_3.6.5.patch | 58 ---------------------- |
14 |
1 file changed, 58 deletions(-) |
15 |
|
16 |
diff --git a/dev-ruby/facter/files/is-integer_fact-1624_3.6.5.patch b/dev-ruby/facter/files/is-integer_fact-1624_3.6.5.patch |
17 |
deleted file mode 100644 |
18 |
index c7b8d80b2c7..00000000000 |
19 |
--- a/dev-ruby/facter/files/is-integer_fact-1624_3.6.5.patch |
20 |
+++ /dev/null |
21 |
@@ -1,58 +0,0 @@ |
22 |
-From 9cb17d9fdffabab3693f6548f6bfc54ed2251325 Mon Sep 17 00:00:00 2001 |
23 |
-From: Maggie Dreyer <maggie@××××××.com> |
24 |
-Date: Tue, 2 May 2017 10:21:06 -0700 |
25 |
-Subject: [PATCH] (FACT-1624) Use `is_integer` instead of `is_fixednum` and |
26 |
- `is_bignum` |
27 |
- |
28 |
-Ruby 2.4 unified Fixnum and Bignum into Integer. We updated the |
29 |
-Leatherman API to match this. This commit updates Facter to use the new |
30 |
-API. |
31 |
---- |
32 |
- lib/src/ruby/module.cc | 2 +- |
33 |
- lib/src/ruby/ruby_value.cc | 6 +++--- |
34 |
- 2 files changed, 4 insertions(+), 4 deletions(-) |
35 |
- |
36 |
-diff --git a/lib/src/ruby/module.cc b/lib/src/ruby/module.cc |
37 |
-index 2d7223e0f..b8aeeed09 100644 |
38 |
---- a/lib/src/ruby/module.cc |
39 |
-+++ b/lib/src/ruby/module.cc |
40 |
-@@ -866,7 +866,7 @@ namespace facter { namespace ruby { |
41 |
- // Unfortunately we have to call to_sym rather than using ID2SYM, which is Ruby version dependent |
42 |
- uint32_t timeout = 0; |
43 |
- volatile VALUE timeout_option = ruby.rb_hash_lookup(argv[1], ruby.to_symbol("timeout")); |
44 |
-- if (ruby.is_fixednum(timeout_option)) { |
45 |
-+ if (ruby.is_integer(timeout_option)) { |
46 |
- timeout = ruby.num2size_t(timeout_option); |
47 |
- } |
48 |
- |
49 |
-diff --git a/lib/src/ruby/ruby_value.cc b/lib/src/ruby/ruby_value.cc |
50 |
-index d8ea20ce6..645472a3f 100644 |
51 |
---- a/lib/src/ruby/ruby_value.cc |
52 |
-+++ b/lib/src/ruby/ruby_value.cc |
53 |
-@@ -86,7 +86,7 @@ namespace facter { namespace ruby { |
54 |
- json.SetString(str, size, allocator); |
55 |
- return; |
56 |
- } |
57 |
-- if (ruby.is_fixednum(value) || ruby.is_bignum(value)) { |
58 |
-+ if (ruby.is_integer(value)) { |
59 |
- json.SetInt64(ruby.rb_num2ll(value)); |
60 |
- return; |
61 |
- } |
62 |
-@@ -155,7 +155,7 @@ namespace facter { namespace ruby { |
63 |
- } |
64 |
- return; |
65 |
- } |
66 |
-- if (ruby.is_fixednum(value) || ruby.is_bignum(value)) { |
67 |
-+ if (ruby.is_integer(value)) { |
68 |
- os << ruby.rb_num2ll(value); |
69 |
- return; |
70 |
- } |
71 |
-@@ -241,7 +241,7 @@ namespace facter { namespace ruby { |
72 |
- emitter << str; |
73 |
- return; |
74 |
- } |
75 |
-- if (ruby.is_fixednum(value) || ruby.is_bignum(value)) { |
76 |
-+ if (ruby.is_integer(value)) { |
77 |
- emitter << ruby.rb_num2ll(value); |
78 |
- return; |
79 |
- } |