Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master sorcery by Ismael Luceno <ismael AT sourcemage.org>:

 var/lib/sorcery/modules/libmisc  |    2 +-
 var/lib/sorcery/modules/libstage |   10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 33f1a9f7ada5e5e03e1c3ecb85406da312861d66
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    libstage: Remove target files before copying
    
    Fixes a failure mode where it replaces a symlink target instead of the
    symlink itself.
    
    Fixes: https://bugs.sourcemage.org/show_bug.cgi?id=16104

commit 5521832f191589932768ae294c67d3ca0387943a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    libmisc: real_get_safe_locale: Assume C.UTF-8 works on non-glibc systems

commit 9d8ba8c9f5117a44581c5196ed8a34b0eaef81f2
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    libstage: transfer_staged_spell: Simplify making of hlist path

commit 65332adebf3e7900668b5a098be83b5c92fa9e3b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    libstage: Fix typo in synopsis

diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index 1bde1d5..744326e 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -1179,7 +1179,7 @@ real_config_query_list() {
 ## The fallback C is always there.
 #---------------------------------------------------------------------
 real_get_safe_locale() {
-  local sys_locales=$(locale -a)
+  local sys_locales=$(locale -a 2>/dev/null || echo C.UTF-8)
   local check_locales=${1:-C.UTF-8 C.utf8 en_US.UTF-8 en_US.utf8}
   for l in $check_locales
   do
diff --git a/var/lib/sorcery/modules/libstage 
b/var/lib/sorcery/modules/libstage
index 5985672..4212a82 100755
--- a/var/lib/sorcery/modules/libstage
+++ b/var/lib/sorcery/modules/libstage
@@ -1,6 +1,6 @@
 #!/bin/bash
 #---------------------------------------------------------------------
-## @Synopsis Functions for desling with the stage root and installing files 
from the stage root
+## @Synopsis Functions for dealing with the stage root and installing files 
from the stage root
 ## @Copyright Copyright (C) 2004 The Source Mage Team 
<http://www.sourcemage.org>
 ## Functions for desling with the stage root and installing files from the 
stage root
 #---------------------------------------------------------------------
@@ -15,12 +15,7 @@ transfer_staged_spell()
   stage_install_ordinary
 
   # restore any hardlinks, since they were copied over normally
-  local hlist
-  if [[ -n $CAST_TMPDIR ]]; then
-    hlist="$CAST_TMPDIR/hardlinks"
-  else
-    hlist="$TMP_DIR/hardlinks"
-  fi
+  local hlist="${CAST_TMPDIR:-$TMP_DIR}/hardlinks"
   if [[ -s $hlist ]]; then
     local inode last_inode filename last_filename
     sort "$hlist" |
@@ -153,6 +148,7 @@ stage_install_file()
       fi
       ;;
     *)
+      rm -f "${INSTALL_ROOT}/$FILE"
       cp -fdp "$STAGE_DIRECTORY/TRANSL/$FILE" "${INSTALL_ROOT}/$FILE"
       # we can't fix symlinks now, since the other file is often not on the 
system yet
       # doing it later in TRANSFER also avoids the search for matching inodes