mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fix another race

Browse source 
Use a different tmp directory so the cache cleanup won't delete the
locpath directory while it's being populated.

This does change the hash used for the locpath directory, but it already
changed in f0ec725234
This commit is contained in:
Joey Hess 2020-10-06 08:44:05 -04:00
parent 2daa28c05f
commit 224623e72e
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
standalone/linux/skel/runshell
View file

@ -133,23 +133,25 @@ unset LD_PRELOAD
ORIG_LOCPATH="$LOCPATH" ORIG_LOCPATH="$LOCPATH"
export ORIG_LOCPATH export ORIG_LOCPATH
if [ -z "${LOCPATH+set}" ] && [ -z "$GIT_ANNEX_PACKAGE_INSTALL" ]; then if [ -z "${LOCPATH+set}" ] && [ -z "$GIT_ANNEX_PACKAGE_INSTALL" ]; then
LOCPATH="$HOME/.cache/git-annex/locales/$(cat "$base/buildid")_$(echo "$base" | tr / _ )" locpathbase="$(cat "$base/buildid")_$(echo "$base" | tr / _ )"
# try to generate a short version, if md5sum is available # try to generate a short version, if md5sum is available
locpathmd5=$( (echo "$LOCPATH" | md5sum | cut -d ' ' -f 1 2>/dev/null) || true) locpathmd5=$( (echo "$locpathbase" | md5sum | cut -d ' ' -f 1 2>/dev/null) || true)
if [ -n "$locpathmd5" ]; then if [ -n "$locpathmd5" ]; then
LOCPATH="$HOME/.cache/git-annex/locales/$locpathmd5" locpathbase="$locpathmd5"
fi fi
LOCPATH="$HOME/.cache/git-annex/locales/$locpathbase"
export LOCPATH export LOCPATH
if [ ! -d "$LOCPATH" ]; then if [ ! -d "$LOCPATH" ]; then
if ! mkdir -p "$LOCPATH.$$"; then locpathtmp="$HOME/.cache/git-annex/locales.tmp/$locpathbase.$$"
echo "Unable to write to $LOCPATH.$$; can't continue!" >&2 if ! mkdir -p "$locpathtmp"; then
echo "Unable to write to $locpathtmp; can't continue!" >&2
exit 1 exit 1
fi fi
echo "$base" > "$LOCPATH.$$/base" echo "$base" > "$locpathtmp/base"
# Not using cp to avoid using the one bundled with git-annex # Not using cp to avoid using the one bundled with git-annex
# before the environment is set up to run it. # before the environment is set up to run it.
cat < "$base/buildid" > "$LOCPATH.$$/buildid" cat < "$base/buildid" > "$locpathtmp/buildid"
# Generate locale definition files for the locales in use, # Generate locale definition files for the locales in use,
# using the localedef and locale files from the bundle. # using the localedef and locale files from the bundle.
@ -161,25 +163,25 @@ if [ -z "${LOCPATH+set}" ] && [ -z "$GIT_ANNEX_PACKAGE_INSTALL" ]; then
"$LC_IDENTIFICATION" "$LC_ALL"; do "$LC_IDENTIFICATION" "$LC_ALL"; do
if [ -n "$localeenv" ] && [ "$localeenv" != "$lastlocaleenv" ]; then if [ -n "$localeenv" ] && [ "$localeenv" != "$lastlocaleenv" ]; then
lastlocaleenv="$localeenv" lastlocaleenv="$localeenv"
if [ ! -d "$LOCPATH.$$/$localeenv" ]; then if [ ! -d "$locpathtmp/$localeenv" ]; then
if [ "${localeenv##[!.]*.}" = "utf8" ] || [ "${localeenv##[!.]*.}" = "UTF-8" ]; then if [ "${localeenv##[!.]*.}" = "utf8" ] || [ "${localeenv##[!.]*.}" = "UTF-8" ]; then
( (
mkdir -p "$LOCPATH.$$/$localeenv" && mkdir -p "$locpathtmp/$localeenv" &&
# cd to $base since localedef reads files from pwd # cd to $base since localedef reads files from pwd
cd "$base" && cd "$base" &&
# Run localedef using the bundled i18n files; # Run localedef using the bundled i18n files;
# use LANG=C to avoid it reading the system locale archive. # use LANG=C to avoid it reading the system locale archive.
I18NPATH="$base/i18n" LANG=C localedef -i "${localeenv%%.*}" -c -f UTF-8 "$LOCPATH.$$/$localeenv" I18NPATH="$base/i18n" LANG=C localedef -i "${localeenv%%.*}" -c -f UTF-8 "$locpathtmp/$localeenv"
) >/dev/null 2>/dev/null || true ) >/dev/null 2>/dev/null || true
fi fi
fi fi
fi fi
done done
mv "$LOCPATH.$$" "$LOCPATH" mv "$locpathtmp" "$LOCPATH"
# In a race, LOCPATH may get created by another process, # In a race, LOCPATH may get created by another process,
# in which cache the mv above would put it here. # in which cache the mv above would put it here.
rm -rf "$LOCPATH/$LOCPATH.$$" rm -rf "$LOCPATH/$locpathbase.$$"
fi fi
# Clean up locale caches when their standalone bundle no longer exists. # Clean up locale caches when their standalone bundle no longer exists.