playbook/upgrader: set locale so that sort behaves the same between cron and command line

0093020b · Joanne Hugé · 91c9d4a7 · 0093020b · 0093020b
Commit 0093020b authored Jun 16, 2023 by Joanne Hugé
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

playbook/roles/upgrader/tasks/main.yml playbook/roles/upgrader/tasks/main.yml +1 -1

playbook/util/upload-to-cache playbook/util/upload-to-cache +1 -1

No files found.
--- a/playbook/roles/upgrader/tasks/main.yml
+++ b/playbook/roles/upgrader/tasks/main.yml
@@ -25,7 +25,7 @@
      chdir: /opt/upgrader/tmp

  - name: Check uncompressed archive sha256sum
-    shell: cd /opt/upgrader/tmp && find . -type f ! -name 'sha256sum' -print0 | sort -z | xargs -0 sha256sum | sha256sum --check sha256sum
+    shell: cd /opt/upgrader/tmp && find . -type f ! -name 'sha256sum' -print0 | LC_ALL=C sort -z | xargs -0 sha256sum | sha256sum --check sha256sum
    register: playbook_sha256sum

  - shell: cp -R /opt/upgrader/tmp /opt/upgrader/playbook

--- a/playbook/util/upload-to-cache
+++ b/playbook/util/upload-to-cache
@@ -3,5 +3,5 @@ conf=${1:-/etc/opt/slapcache.cfg}
 conf=$(realpath $conf)

 cd $playbook_dir
-find . -type f ! -name 'sha256sum' -print0 | sort -z | xargs -0 sha256sum | sha256sum > sha256sum
+find . -type f ! -name 'sha256sum' -print0 | LC_ALL=C sort -z | xargs -0 sha256sum | sha256sum > sha256sum
 rm -f /tmp/archive.tar.gz && tar -czvf /tmp/archive.tar.gz . && slapcache-upload --file=/tmp/archive.tar.gz --slapos-configuration=$conf