socotra-build 0.3.13 → 0.3.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/socotra-build.rb +3 -3
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 94873007d229c8f9921561580d22327c26d2ca22
|
|
4
|
+
data.tar.gz: 8f961c4283bdad5df3257ec1b603e48551a429a5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a64dab678bab403bfc27bf3017bce64c4077fa16803681f7db746abbaba92acc6cc05fb4f2099a7d328b014c92dac1e04e781f7b1ec313a6ff1ed47786582c57
|
|
7
|
+
data.tar.gz: d3eb7ec28e2a3a9173687c5842f297265aeec7fbafbf021b8c1c0d1c4904fbd413700d7debdfd9455ef4bd0eb6e60d45faf05b9d1c285efdfe2928ca3050dbb9
|
data/lib/socotra-build.rb
CHANGED
|
@@ -3,7 +3,7 @@ require 'set'
|
|
|
3
3
|
|
|
4
4
|
def self.safe_retry(cmd, description, error_message="command failed", raise_on_fail=true, log_level="ERROR", log=true, tries=3)
|
|
5
5
|
begin
|
|
6
|
-
status, output = system_safe(cmd, description, error_message, raise_on_fail=raise_on_fail, log_level=log_level, log=log)
|
|
6
|
+
status, output = system_safe(cmd, description, error_message, raise_on_fail=raise_on_fail, log_level=log_level, log=log, retry_exec=true)
|
|
7
7
|
rescue
|
|
8
8
|
if (tries -= 1) > 0
|
|
9
9
|
sleep 5
|
|
@@ -19,7 +19,7 @@ def self.safe_retry(cmd, description, error_message="command failed", raise_on_f
|
|
|
19
19
|
return status
|
|
20
20
|
end
|
|
21
21
|
|
|
22
|
-
def self.system_safe(cmd, cmd_description, error_message, raise_on_fail=true, log_level="ERROR", log=true, print_command=true)
|
|
22
|
+
def self.system_safe(cmd, cmd_description, error_message, raise_on_fail=true, log_level="ERROR", log=true, print_command=true, retry_exec=false)
|
|
23
23
|
|
|
24
24
|
start = Time.now.to_i
|
|
25
25
|
stdout, stderr, status = Open3.capture3(cmd)
|
|
@@ -67,7 +67,7 @@ def self.system_safe(cmd, cmd_description, error_message, raise_on_fail=true, lo
|
|
|
67
67
|
|
|
68
68
|
puts "\t#{cmd_description} took #{elapsed} seconds"
|
|
69
69
|
|
|
70
|
-
if not status.success? and raise_on_fail
|
|
70
|
+
if not status.success? and not retry_exec and raise_on_fail
|
|
71
71
|
if log
|
|
72
72
|
puts "#{log_level}: see logs/#{cmd_description}_out.log and #{cmd_description}_err.log for details"
|
|
73
73
|
end
|