New commits:
commit f8b7a41b5dc30075746cdaeef8df878045faa2c8
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
delve: redirect messages that should be shown with VOYEUR=off too
diff --git a/ChangeLog b/ChangeLog
index 13bfae0..4208d13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-10-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * delve: redirect messages that should be shown with VOYEUR=off too
+
2008-10-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libcodex, libqueue, scribe.8: fixed #14772; grimoires without a
version index are treated the old way and the correct entry for a
diff --git a/usr/sbin/delve b/usr/sbin/delve
index 39661a2..92be8c1 100755
--- a/usr/sbin/delve
+++ b/usr/sbin/delve
@@ -145,7 +145,8 @@ function delve_build() {
delve_log_helper
(
run_build
- ) 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
+ ) 3> >(tee -a $C_LOG >> /dev/stdout) \
+ 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
> >(tee -a $C_LOG > $VOYEUR_STDOUT)
}
@@ -155,7 +156,8 @@ function delve_pre_install() {
delve_log_helper
(
run_pre_install
- ) 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
+ ) 3> >(tee -a $C_LOG >> /dev/stdout) \
+ 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
> >(tee -a $C_LOG > $VOYEUR_STDOUT)
}
@@ -184,7 +186,8 @@ function delve_install() {
else
$CHROOT_CMD delve $SPELL INSTALL
fi
- ) 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
+ ) 3> >(tee -a $C_LOG >> /dev/stdout) \
+ 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
> >(tee -a $C_LOG > $VOYEUR_STDOUT)
local rc=$?
if [[ $CHROOT_CMD ]]
@@ -218,7 +221,8 @@ function delve_install_extras() {
else
$CHROOT_CMD delve $SPELL INSTALL_EXTRAS
fi
- ) 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
+ ) 3> >(tee -a $C_LOG >> /dev/stdout) \
+ 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
> >(tee -a $C_LOG > $VOYEUR_STDOUT)
local rc=$?
if [[ $CHROOT_CMD ]]
@@ -240,7 +244,8 @@ function delve_post_build() {
cd $SOURCE_DIRECTORY
(
run_post_build
- ) 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
+ ) 3> >(tee -a $C_LOG >> /dev/stdout) \
+ 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
> >(tee -a $C_LOG > $VOYEUR_STDOUT)
}
@@ -250,7 +255,8 @@ function delve_post_install() {
delve_log_helper
(
run_post_install
- ) 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
+ ) 3> >(tee -a $C_LOG >> /dev/stdout) \
+ 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
> >(tee -a $C_LOG > $VOYEUR_STDOUT)
}
@@ -260,7 +266,8 @@ function delve_transfer() {
delve_log_helper
(
run_transfer
- ) 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
+ ) 3> >(tee -a $C_LOG >> /dev/stdout) \
+ 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
> >(tee -a $C_LOG > $VOYEUR_STDOUT)
}
@@ -272,7 +279,8 @@ function delve_final() {
STAGED_INSTALL=off
(
run_final
- ) 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
+ ) 3> >(tee -a $C_LOG >> /dev/stdout) \
+ 2> >(tee -a $C_LOG 1>&2 > $VOYEUR_STDERR) \
> >(tee -a $C_LOG > $VOYEUR_STDOUT)
}
[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (f8b7a41b5dc30075746cdaeef8df878045faa2c8),
Jaka Kranjc, 10/08/2008