Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos-mynij-dev
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mynij
slapos-mynij-dev
Commits
c68e991b
Commit
c68e991b
authored
May 19, 2017
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: Only cat if the file exit
If there is no error, the raise can be missleading.
parent
ba356fee
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
software/slaprunner/buildout.hash.cfg
software/slaprunner/buildout.hash.cfg
+1
-1
software/slaprunner/instance-runner-import.cfg.in
software/slaprunner/instance-runner-import.cfg.in
+3
-1
No files found.
software/slaprunner/buildout.hash.cfg
View file @
c68e991b
...
@@ -27,7 +27,7 @@ md5sum = feee1dc29d160e0d796dab0ba767745f
...
@@ -27,7 +27,7 @@ md5sum = feee1dc29d160e0d796dab0ba767745f
[instance-runner-import]
[instance-runner-import]
filename = instance-runner-import.cfg.in
filename = instance-runner-import.cfg.in
md5sum =
0701cf6282efa28086990f73ec2a319f
md5sum =
154be5ff86a145fca4c1358c15196efa
[template-runner-export-script]
[template-runner-export-script]
filename = template/runner-export.sh.jinja2
filename = template/runner-export.sh.jinja2
...
...
software/slaprunner/instance-runner-import.cfg.in
View file @
c68e991b
...
@@ -118,7 +118,9 @@ input = inline: #!/bin/sh
...
@@ -118,7 +118,9 @@ input = inline: #!/bin/sh
echo "Consistency check is too old.";
echo "Consistency check is too old.";
exit 1;
exit 1;
else
else
cat $${importer:restore-error-message-file}
if [ -f "$${importer:restore-error-message-file}" ]; then
cat $${importer:restore-error-message-file}
fi
echo "More information can be found here : $RESILIENT_LOG_URL";
echo "More information can be found here : $RESILIENT_LOG_URL";
exit $(cat $EXIT_CODE_FILE);
exit $(cat $EXIT_CODE_FILE);
fi
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment