New commits:
commit e745f260b8d8dd858997547e801f5ebe13d699be
Author: root <root@kajit-master.(none)>
Commit: root <root@kajit-master.(none)>
Okay added install extras stage and transfer stage to delve and build
api2 also fixed delve to check proper file in each state
commit 4ece510b2c867b7c937d8b781b84276969af672e
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>
add a routine to note modified config files
diff --git a/ChangeLog b/ChangeLog
index 40360f1..32cefc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-17 Andrew Stitt <astitt AT sourcemage.org>
+ * libtrack, libapi: add a routine to record modified config files,
+ this is an alternative to running install_config_files
+
2006-11-14 Andrew Stitt <astitt AT sourcemage.org>
* protected: protect /etc/sysconfig/facilities to smooth over
the bumps from bug 13123.
diff --git a/usr/sbin/delve b/usr/sbin/delve
index 40ba077..cca8862 100755
--- a/usr/sbin/delve
+++ b/usr/sbin/delve
@@ -147,7 +147,7 @@ function delve_build() {
+function run_install_extras() {
+
+ debug "build_api/api2" "Starting run_install_extras()"
+ run_spell_file INSTALL_EXTRAS install_extras
+}
+
#---------------------------------------------------------------------
## Checks for a POST_BUILD file in SCRIPT_DIRECTORY, and if it is
## executable, runs it. This file is run after INSTALL and before
@@ -227,14 +234,15 @@ function run_post_install() {
run_spell_file POST_INSTALL post_install
unlock_resources "libgrimoire" "install"
}
+
#--------------------------------------------------------------------
### Checks against STAGED_INSTALL and installs the staged spell
### accordingly
##--------------------------------------------------------------------
-function run_stage_install() {
+function run_transfer() {
if [[ "$STAGED_INSTALL" != "off" ]]
then
- install_staged_spell
+ run_spell_file TRANSFER transfer
fi
}
@@ -333,7 +341,7 @@ function real_default_sorcery_install()
##
## This is identical to api1's post_build
#---------------------------------------------------------------------
-function real_default_sorcery_post_install() {
+function real_default_sorcery_install_extras() {
#---------------------------------------------------------------------
## @Type API
+## @See <@function
var.lib.sorcery.modules.libtrack.html,real_note_config_file> for more details.
+## @param spell file to check for modification
+##
+#---------------------------------------------------------------------
+function note_config_file() {
+ debug "libapi" "note_config_file - $*"
+ real_note_config_file "$@"
+}
+
+#---------------------------------------------------------------------
+## @Type API
## @See <@function var.lib.sorcery.modules.libtriggers.html,real_on_cast>
for more details.
## @param spell that triggers
## @param action
diff --git a/var/lib/sorcery/modules/libspell
b/var/lib/sorcery/modules/libspell
index 79ecde0..f708e92 100644
--- a/var/lib/sorcery/modules/libspell
+++ b/var/lib/sorcery/modules/libspell
@@ -36,7 +36,9 @@ BUILD:build
PRE_INSTALL:pre_install
INSTALL:install
POST_BUILD:post_build
+INSTALL_EXTRAS:install_extras
POST_INSTALL:post_install
+TRANSFER:transfer
FINAL:final
UP_TRIGGERS:up_triggers
diff --git a/var/lib/sorcery/modules/libstage
b/var/lib/sorcery/modules/libstage
index 19f6dbf..b781db1 100755
--- a/var/lib/sorcery/modules/libstage
+++ b/var/lib/sorcery/modules/libstage
@@ -10,7 +10,7 @@
## Main for installing staged spell called imediatly after devoking
## installwatch and stage root
#---------------------------------------------------------------------
-function install_staged_spell()
+function transfer_staged_spell()
{
mkdir -p "$CONFIG_STAGE_DIRECTORY/$SPELL/current"
stage_install_configs
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index 368d80d..cdf1b87 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -58,7 +58,7 @@ function real_invoke_stage_root()
export CASTFS_LOGFILE=${CASTFS_DBGLOG}
export CASTFS_DBGLVL=${CASTFS_DEBUG_LEVEL}
local CASTFS_IGNORE_LIST=""
- local LOCAL_IGNORE_DIRS="${CCACHE_DIR}"
+ local LOCAL_IGNORE_DIRS="${CCACHE_DIR} ${DISTCC_DIR}"
# this forks and daemonizes so it will exit you simply unmount the dir to
stop the process
for dir in ${CASTFS_UNSTAGED_PATHS} ${LOCAL_IGNORE_DIRS}
do
@@ -213,6 +213,16 @@ function create_md5list() {
}
#---------------------------------------------------------------------
+## External api to note config files
+#---------------------------------------------------------------------
+function real_note_config_file() {
+ if check_if_modified "$1"; then
+ mark_file_modified "$1"
+ fi
+}
+
+
+#---------------------------------------------------------------------
## Notes that a file was previously modified so that its md5 is
## deliberatly munged
#---------------------------------------------------------------------
[SM-Commit] GIT changes to devel-stage-root sorcery by root (dbdd4e4c0f814774e228e0d6c80f50ed9d860dc8),
root, 11/17/2006