Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
slapos
Commits
1ba91b06
Commit
1ba91b06
authored
Feb 27, 2017
by
Vincent Pelletier
Committed by
Rafael Monnerat
May 05, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/slaprunner: Get rid of redundant LC_ALL definition.
parent
ebf4e722
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
software/slaprunner/buildout.hash.cfg
software/slaprunner/buildout.hash.cfg
+1
-1
software/slaprunner/template/runner-export.sh.jinja2
software/slaprunner/template/runner-export.sh.jinja2
+2
-2
No files found.
software/slaprunner/buildout.hash.cfg
View file @
1ba91b06
...
@@ -31,7 +31,7 @@ md5sum = 9db9957f452bda370cb2d5cc2e833e85
...
@@ -31,7 +31,7 @@ md5sum = 9db9957f452bda370cb2d5cc2e833e85
[template-runner-export-script]
[template-runner-export-script]
filename = template/runner-export.sh.jinja2
filename = template/runner-export.sh.jinja2
md5sum =
5cc9829a25d129740158e97c9899bbfa
md5sum =
aba6f56ad7ba9e177aed5fcfcb90d926
[instance-runner-export]
[instance-runner-export]
filename = instance-runner-export.cfg.in
filename = instance-runner-export.cfg.in
...
...
software/slaprunner/template/runner-export.sh.jinja2
View file @
1ba91b06
...
@@ -65,7 +65,7 @@ fi
...
@@ -65,7 +65,7 @@ fi
(
(
cd "$backup_directory"
cd "$backup_directory"
find -type f ! -name backup.signature -print0 | xargs -0 sha256sum |
LC_ALL=C
sort -k 66 > backup.signature
find -type f ! -name backup.signature -print0 | xargs -0 sha256sum | sort -k 66 > backup.signature
)
)
# Check that export didn't happen during backup of instances
# Check that export didn't happen during backup of instances
...
@@ -88,7 +88,7 @@ if [ -z "$backup_directory_path" ]; then
...
@@ -88,7 +88,7 @@ if [ -z "$backup_directory_path" ]; then
fi
fi
sleep 5
sleep 5
sha256sum
$backup_directory_path | LC_ALL=C sort -k 66 > $tmp_backup_sum
sha256sum
"$backup_directory_path" | sort -k 66 > "$tmp_backup_sum"
cat {{ directory['backup'] }}/backup.signature | egrep "instance/slappart.*/srv/backup/" > $tmp_filtered_signature
cat {{ directory['backup'] }}/backup.signature | egrep "instance/slappart.*/srv/backup/" > $tmp_filtered_signature
# If the diff fails, then the notifier will restart this script
# If the diff fails, then the notifier will restart this script
...
...
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