foreman_maintain 1.7.10 → 1.7.12
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: af20a8d9dd007ddf36380f4378410f034651c14753d6860ec300905b06fbeb54
|
4
|
+
data.tar.gz: 1f27e90541e0d42c81287b5fec9d69e50d9ecbdee6b200bc3ccc82d86ae818bd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b7cdaed0e55541bc9ecab38db05ed857535c5f78df1ccc7e85a9e5b6d42590cdf27982e20f5f5d6faa9e8f7ed17de3d581fb5bcd2819c6e7e0f8f221f8f688cf
|
7
|
+
data.tar.gz: fc0799518914a804fbaed0e89e60e0bbc0d02efb01d8110ee2c3163bf158d83f9a241deadea927a2b9b8fbe849274a76c38fa20320c23089945aaf0fb5a291cb
|
@@ -18,8 +18,8 @@ class Checks::CheckSha1CertificateAuthority < ForemanMaintain::Check
|
|
18
18
|
|
19
19
|
begin
|
20
20
|
certificates = load_fullchain(server_ca)
|
21
|
-
rescue OpenSSL::X509::CertificateError
|
22
|
-
assert(false, "Error reading server CA certificate #{server_ca}.")
|
21
|
+
rescue OpenSSL::X509::CertificateError => e
|
22
|
+
assert(false, "Error reading server CA certificate #{server_ca}.\n #{e.message}")
|
23
23
|
else
|
24
24
|
msg = <<~MSG
|
25
25
|
Server CA certificate #{server_ca} signed with sha1 which will break on upgrade.
|
@@ -41,7 +41,8 @@ class Checks::CheckSha1CertificateAuthority < ForemanMaintain::Check
|
|
41
41
|
# Can be removed when only Ruby with load_file support is supported
|
42
42
|
File.binread(bundle_pem).
|
43
43
|
lines.
|
44
|
-
slice_after(
|
44
|
+
slice_after(/^-----END CERTIFICATE-----/).
|
45
|
+
filter { |pem| pem.join.include?('-----END CERTIFICATE-----') }.
|
45
46
|
map { |pem| OpenSSL::X509::Certificate.new(pem.join) }
|
46
47
|
end
|
47
48
|
end
|
@@ -25,7 +25,14 @@ class Features::Pulpcore < ForemanMaintain::Feature
|
|
25
25
|
end
|
26
26
|
|
27
27
|
def running_tasks
|
28
|
-
cli('task list --state-in running --state-in canceling')
|
28
|
+
tasks = cli('task list --state-in running --state-in canceling')
|
29
|
+
# cli() uses parse_json() which swallows JSON::ParserError and returns nil
|
30
|
+
# but running_tasks should return an Array
|
31
|
+
if tasks.nil?
|
32
|
+
[]
|
33
|
+
else
|
34
|
+
tasks
|
35
|
+
end
|
29
36
|
rescue ForemanMaintain::Error::ExecutionError
|
30
37
|
[]
|
31
38
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: foreman_maintain
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.7.
|
4
|
+
version: 1.7.12
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ivan Nečas
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2025-02-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: clamp
|