Procházet zdrojové kódy

Merge pull request #14369 from maximkulkin/14123-dockerize-disk-with-non-en-locale

Fix dockerize-disk.sh working in non-en locale
Jessie Frazelle před 10 roky
rodič
revize
16f8afb451
1 změnil soubory, kde provedl 1 přidání a 1 odebrání
  1. 1 1
      contrib/dockerize-disk.sh

+ 1 - 1
contrib/dockerize-disk.sh

@@ -74,7 +74,7 @@ mount -t aufs -o "br=$builddir/diff=rw${base_image_mounts},dio,xino=/dev/shm/auf
 
 
 # Update files
 # Update files
 cd $builddir
 cd $builddir
-diff -rq disk_image workdir \
+LC_ALL=C diff -rq disk_image workdir \
   | sed -re "s|Only in workdir(.*?): |DEL \1/|g;s|Only in disk_image(.*?): |ADD \1/|g;s|Files disk_image/(.+) and workdir/(.+) differ|UPDATE /\1|g" \
   | sed -re "s|Only in workdir(.*?): |DEL \1/|g;s|Only in disk_image(.*?): |ADD \1/|g;s|Files disk_image/(.+) and workdir/(.+) differ|UPDATE /\1|g" \
   | while read action entry; do
   | while read action entry; do
       case "$action" in
       case "$action" in