Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Ismael Luceno (7e8c72ccd268da1a510668e12ad41b5f6af5db5c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Ismael Luceno (7e8c72ccd268da1a510668e12ad41b5f6af5db5c)
  • Date: Sat, 4 Apr 2020 01:16:32 +0000

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

var/lib/sorcery/modules/libcast | 26 ++++++++++++--------------
var/lib/sorcery/protected | 1 +
2 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 7e8c72ccd268da1a510668e12ad41b5f6af5db5c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libcast: Add fallback for non-functional log compressor

commit 92038083f4cfe62fd4bc38f376217fa5ff9ec229
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

protected: Add libiconv; needed on non-glibc systems

diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index 75f3cc2..4590f84 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -679,25 +679,23 @@ acquire_cast_lock() {
## our compile log directory.
#---------------------------------------------------------------------
create_compile_log() {
- local tmp_log=$C_LOG.2
-
message "${MESSAGE_COLOR}Creating compile log" \
"${FILE_COLOR}$COMPILE_LOGS/$SPELL-$VERSION$EXTENSION" \
"${DEFAULT_COLOR}"
- if [[ "$STORE_CONF_LOG" == on ]] && test -e $SOURCE_DIRECTORY/config.log;
then
- echo "---config.log---" >> $C_LOG
- cat $SOURCE_DIRECTORY/config.log >> $C_LOG
- fi
-
- # remove any nplicated lines (happens due to all the redirection we do)
- uniq $C_LOG > $tmp_log
- mv $tmp_log $C_LOG
-
+ {
+ # remove any nplicated lines (happens due to all the redirection we do)
+ uniq "$C_LOG"
+ # append config.log
+ if [ on = "$STORE_CONF_LOG" ] && [ -e "$SOURCE_DIRECTORY"/config.log ];
then
+ echo '---config.log---'
+ cat "$SOURCE_DIRECTORY"/config.log
+ fi
+ } |
# install the compile log
- if [ -z "$EXTENSION" ]; then
- cp $C_LOG $COMPILE_LOGS/$SPELL-$VERSION
+ if [ -z "$EXTENSION" ] || ! "$COMPRESSBIN" </dev/null &>/dev/null; then
+ cat > "$COMPILE_LOGS/$SPELL-$VERSION"
else
- $COMPRESSBIN -c $C_LOG > "$COMPILE_LOGS/$SPELL-$VERSION$EXTENSION"
+ "$COMPRESSBIN" -c > "$COMPILE_LOGS/$SPELL-$VERSION$EXTENSION"
fi

# install the castfs log
diff --git a/var/lib/sorcery/protected b/var/lib/sorcery/protected
index d6c3d60..709e835 100755
--- a/var/lib/sorcery/protected
+++ b/var/lib/sorcery/protected
@@ -64,6 +64,7 @@
^/usr/bin/wget$
^/usr/lib/installwatch\.so$
^/usr/lib/libc\.so$
+^/usr/lib/libiconv\.so\.
^/usr/share/httpd
^/usr/share/httpsd
^/usr/share/info/dir$



  • [SM-Commit] GIT changes to master sorcery by Ismael Luceno (7e8c72ccd268da1a510668e12ad41b5f6af5db5c), Ismael Luceno, 04/03/2020

Archive powered by MHonArc 2.6.24.

Top of Page