Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Bor Kraljič (dbde70059610d9270606dd763e89b8ad7a6fe4fb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Bor Kraljič (dbde70059610d9270606dd763e89b8ad7a6fe4fb)
  • Date: Fri, 21 Oct 2011 06:00:58 -0500

GIT changes to master sorcery by Bor Kraljič <pyrobor AT ver.si>:

ChangeLog | 4 ++++
usr/sbin/cleanse | 1 +
usr/sbin/confmeld | 1 +
usr/sbin/scribbler | 1 +
usr/sbin/scribe | 1 +
usr/sbin/sorcery | 1 +
6 files changed, 9 insertions(+)

New commits:
commit dbde70059610d9270606dd763e89b8ad7a6fe4fb
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

cleanse, confmeld, scribbler, scribe, sorcery: added missing init_hooks

fixes #298
Patch was reviewed and approved by Jaka Kranjc before commiting.

diff --git a/ChangeLog b/ChangeLog
index c42cd4d..2460a75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-21 Bor Kraljič <pyrobor AT ver.si>
+ * cleanse, confmeld, scribbler, scribe, sorcery: added missing
init_hooks,
+ fixes #298
+
2011-10-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* etc/hooks ...: added hooks support, initial patch by Andraž Levstik

diff --git a/usr/sbin/cleanse b/usr/sbin/cleanse
index d171875..5a4cff6 100755
--- a/usr/sbin/cleanse
+++ b/usr/sbin/cleanse
@@ -1085,6 +1085,7 @@ if [ $UID -eq 0 ] ; then
message "Unable to make tmp dirs..."
exit 1
fi
+ init_hooks
args "$@"
rc=$?
cleanup_tmp_dir $TMP_DIR
diff --git a/usr/sbin/confmeld b/usr/sbin/confmeld
index bb8724c..5e42d8f 100755
--- a/usr/sbin/confmeld
+++ b/usr/sbin/confmeld
@@ -319,6 +319,7 @@ if [ "$UID" -gt 0 ]; then
exec su -c "confmeld $@" root
else
STAGED_INSTALL="off"
+ init_hooks
main "$@"
fi

diff --git a/usr/sbin/scribbler b/usr/sbin/scribbler
index 9d00ae3..b245205 100755
--- a/usr/sbin/scribbler
+++ b/usr/sbin/scribbler
@@ -186,6 +186,7 @@ if [ "${UID}" != 0 ]; then
exec su -c "scribbler $PARAMS" root
fi

+init_hooks
main "$@"
#---------------------------------------------------------------------
##
diff --git a/usr/sbin/scribe b/usr/sbin/scribe
index 74712f0..0872c96 100755
--- a/usr/sbin/scribe
+++ b/usr/sbin/scribe
@@ -858,6 +858,7 @@ if [ "$UID" == 0 ] ; then
renice $NICE -p $$ >/dev/null
fi
mk_tmp_dirs scribe
+ init_hooks
main $@
rc=$?
cleanup_tmp_dir $TMP_DIR
diff --git a/usr/sbin/sorcery b/usr/sbin/sorcery
index 4b4f30d..6cbc565 100755
--- a/usr/sbin/sorcery
+++ b/usr/sbin/sorcery
@@ -1960,6 +1960,7 @@ if [ "$UID" == 0 ]; then

SORCERY_VERSION=`cat /etc/sorcery/version`
mk_tmp_dirs sorcery
+ init_hooks
main "$@"
rc=$?
cleanup_tmp_dir $TMP_DIR



  • [SM-Commit] GIT changes to master sorcery by Bor Kraljič (dbde70059610d9270606dd763e89b8ad7a6fe4fb), Bor Kraljič, 10/21/2011

Archive powered by MHonArc 2.6.24.

Top of Page