Mentions légales du service

Skip to content
Snippets Groups Projects
Commit c3b96a5f authored by Jonathan Pastor's avatar Jonathan Pastor
Browse files

Diff action return an exit code

parent c8ebf7fb
No related branches found
No related tags found
1 merge request!6WIP: Features/oar gpus
...@@ -800,6 +800,7 @@ def get_oar_properties_from_oar(options) ...@@ -800,6 +800,7 @@ def get_oar_properties_from_oar(options)
end end
def do_diff(options, generated_hierarchy, refrepo_properties) def do_diff(options, generated_hierarchy, refrepo_properties)
ret = 0
properties = { properties = {
'ref' => refrepo_properties, 'ref' => refrepo_properties,
...@@ -987,6 +988,8 @@ TXT ...@@ -987,6 +988,8 @@ TXT
end # if options[:diff] end # if options[:diff]
end end
return ret
end end
...@@ -1388,6 +1391,8 @@ def generate_oar_properties(options) ...@@ -1388,6 +1391,8 @@ def generate_oar_properties(options)
# Output generated information # Output generated information
############################################ ############################################
ret = 0
# DO=table # DO=table
if options.key? :table and options[:table] if options.key? :table and options[:table]
export_rows_as_formated_line(generated_hierarchy) export_rows_as_formated_line(generated_hierarchy)
...@@ -1401,7 +1406,7 @@ def generate_oar_properties(options) ...@@ -1401,7 +1406,7 @@ def generate_oar_properties(options)
# Do=Diff # Do=Diff
if options.key? :diff and options[:diff] if options.key? :diff and options[:diff]
do_diff(options, generated_hierarchy, refrepo_properties) ret = do_diff(options, generated_hierarchy, refrepo_properties)
end end
# Do=update # Do=update
...@@ -1412,7 +1417,7 @@ def generate_oar_properties(options) ...@@ -1412,7 +1417,7 @@ def generate_oar_properties(options)
run_commands_via_ssh(cmds, options) if prompt.downcase == 'y' run_commands_via_ssh(cmds, options) if prompt.downcase == 'y'
end end
return 0 return ret
end end
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment