Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (7a8005304f35d84daf17e7a8002cc186f89fe66f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (7a8005304f35d84daf17e7a8002cc186f89fe66f)
  • Date: Sat, 6 Sep 2008 05:32:06 -0500

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 2 ++
var/lib/sorcery/modules/build_api/api2 | 17 +++++++++++------
2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 7a8005304f35d84daf17e7a8002cc186f89fe66f
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

api2: improve the VOYEUR=off experience by printing some messages
unconditionally to give a better progress indicator

diff --git a/ChangeLog b/ChangeLog
index 86555ed..950a10e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* libmisc: made log_failure_reason idempotent and added an optional
arg
* libdepends: improved the way exiled spells are handled for the cast
summary failure reason feature
+ * api2: improve the VOYEUR=off experience by printing some messages
+ unconditionally to give a better progress indicator

2008-09-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* *: added more locking calls #7917
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index dd6d66b..1d449b6 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -91,8 +91,9 @@ function run_build_spell() {
devoke_installwatch &&
STAGED_INSTALL=off &&
run_final | append_to_notice_log || return 3
- ) 2> >(tee -a $C_LOG 1>&2 >> $VOYEUR_STDERR) \
- > >(tee -a $C_LOG >> $VOYEUR_STDOUT)
+ ) 3> >(tee -a $C_LOG >> /dev/stdout) \
+ 2> >(tee -a $C_LOG 1>&2 >> $VOYEUR_STDERR) \
+ > >(tee -a $C_LOG >> $VOYEUR_STDOUT) \
)
rs=$?
unset __DELVE_IN_CAST
@@ -147,7 +148,7 @@ function run_build() {
echo "Using gcc version: `gcc -dumpversion`" >> $C_LOG
message "${MESSAGE_COLOR}Building" \
"${SPELL_COLOR}${SPELL}" \
- "${DEFAULT_COLOR}"
+ "${DEFAULT_COLOR}" >&3

if [ -d "$SOURCE_DIRECTORY" ] ; then
cd "$SOURCE_DIRECTORY"
@@ -212,11 +213,11 @@ function run_install() {
message "${MESSAGE_COLOR}Installing" \
"${SPELL_COLOR}${SPELL}" \
"${MESSAGE_COLOR}into the stage" \
- "${DEFAULT_COLOR}"
+ "${DEFAULT_COLOR}" >&3
else
message "${MESSAGE_COLOR}Installing" \
"${SPELL_COLOR}${SPELL}" \
- "${DEFAULT_COLOR}"
+ "${DEFAULT_COLOR}" >&3
fi

if [ -f $S_PWD ] ; then
@@ -272,6 +273,10 @@ function run_post_install() {
function run_transfer() {
if [[ "$STAGED_INSTALL" != "off" ]]
then
+ message "${MESSAGE_COLOR}Installing" \
+ "${SPELL_COLOR}${SPELL}" \
+ "${MESSAGE_COLOR}into the system" \
+ "${DEFAULT_COLOR}" >&3
run_spell_file TRANSFER transfer
fi
}
@@ -346,7 +351,7 @@ function real_default_sorcery_build() {
#---------------------------------------------------------------------
function real_default_sorcery_pre_install() {
debug "build_api/api2" "Starting real_default_sorcery_pre_install"
- prepare_install
+ prepare_install >&3
}

#---------------------------------------------------------------------



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (7a8005304f35d84daf17e7a8002cc186f89fe66f), Jaka Kranjc, 09/06/2008

Archive powered by MHonArc 2.6.24.

Top of Page