# Lock made in prepare_install
@@ -160,7 +160,7 @@ function run_post_build() {
#---------------------------------------------------------------------
function run_post_install() {
@@ -199,7 +199,7 @@ function real_default_sorcery_pre_build() {
#---------------------------------------------------------------------
function real_default_sorcery_build() {
- debug "build_api/api1" "Starting real_default_sorcery_build()"
+ debug "build_api1" "Starting real_default_sorcery_build()"
OPTS="$OPTS --build=${BUILD}"
#If this switches are used, they _may_ stop distcc and ccache from working
# for some spells (bug 3798)
@@ -228,7 +228,7 @@ function real_default_sorcery_build() {
#---------------------------------------------------------------------
function real_default_sorcery_post_build() {
@@ -256,7 +256,7 @@ function run_install_extras() {
## stage root properly
#---------------------------------------------------------------------
function run_post_install() {
- debug "build_api/api2" "Starting run_post_install()"
+ debug "build_api2" "Starting run_post_install()"
persistent_load &&
if [[ $STAGED_INSTALL != off ]]
then
@@ -289,7 +289,7 @@ function run_transfer() {
#---------------------------------------------------------------------
function run_final() {
- debug "build_api/api2" "Starting run_final()"
+ debug "build_api2" "Starting run_final()"
run_spell_file FINAL final
}
@@ -323,7 +323,7 @@ function real_default_sorcery_pre_build() {
##
#---------------------------------------------------------------------
function real_default_sorcery_build() {
- debug "build_api/api2" "real_default_sorcery_build"
+ debug "build_api2" "real_default_sorcery_build"
OPTS="$OPTS --build=${BUILD}"
#If these switches are used, they _may_ stop distcc and ccache from working
@@ -351,7 +351,7 @@ function real_default_sorcery_build() {
##
#---------------------------------------------------------------------
function real_default_sorcery_pre_install() {
- debug "build_api/api2" "Starting real_default_sorcery_pre_install"
+ debug "build_api2" "Starting real_default_sorcery_pre_install"
prepare_install >&3
}
@@ -365,7 +365,7 @@ function real_default_sorcery_pre_install() {
##
#---------------------------------------------------------------------
function real_default_sorcery_install() {
- debug "build_api/api2" "Starting real_default_sorcery_install"
+ debug "build_api2" "Starting real_default_sorcery_install"
make install
}
@@ -379,7 +379,7 @@ function real_default_sorcery_install() {
#---------------------------------------------------------------------
function real_default_sorcery_install_extras() {
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index 0c25359..49b3b17 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -21,7 +21,7 @@
## asks the user if they want to edit the custom options
#---------------------------------------------------------------------
function run_config_loc () {
- debug "build_api/common" "Starting run_config_loc() on $SPELL"
+ debug "build_api_common" "Starting run_config_loc() on $SPELL"
pushd . > /dev/null # may have been somewhere else
run_hook config_loc pre
[ -d "$SOURCE_DIRECTORY" ] &&
@@ -200,7 +200,7 @@ function install_pam_confs() {
## This is intended to be overridable at some point
#---------------------------------------------------------------------
function run_spell_success() {
- debug "build_api/common" "cast of $SPELL-$VERSION was successful"
+ debug "build_api_common" "cast of $SPELL-$VERSION was successful"
local INST_LOG="$INSTALL_LOGS/$SPELL-$VERSION"
local MD5_LOG="$MD5SUM_LOGS/$SPELL-$VERSION"
@@ -226,7 +226,7 @@ function run_spell_success() {
pop_install_queue "$SPELL"
# none of the old values are valid, only the new, uncommitted values are
remove_depends_status $DEPENDS_STATUS $SPELL
@@ -373,7 +373,7 @@ function run_spell_success() {
## This is intended to be overridable at some point
#---------------------------------------------------------------------
function run_spell_failure() {
- debug "build_api/common" "cast of $SPELL-$VERSION failed"
+ debug "build_api_common" "cast of $SPELL-$VERSION failed"
local rc=$1
run_hook FAILURE pre
diff --git a/var/lib/sorcery/modules/libcast b/var/lib/sorcery/modules/libcast
index df23ff1..38dd9bf 100755
--- a/var/lib/sorcery/modules/libcast
+++ b/var/lib/sorcery/modules/libcast
@@ -93,7 +93,7 @@ function prepare_spell_config() {
## @return 1 or if there was a problem parsing the CONFLICTS file
#---------------------------------------------------------------------
function query_conflicts() {
- debug "build_api/common" "Starting query_conflicts() on $SPELL"
+ debug "build_api_common" "Starting query_conflicts() on $SPELL"
local ignore_conflict=$1
local output=${2:-$CONFLICT_LIST}
@@ -163,7 +163,7 @@ function dispel_conflicts() {
## @return 1 if the user decides not to accept the security concerns
#---------------------------------------------------------------------
function run_security() {
- debug "build_api/common" "Starting run_security() on $SPELL"
+ debug "build_api_common" "Starting run_security() on $SPELL"
local rc=0
if [[ -f $SCRIPT_DIRECTORY/SECURITY ]]; then
run_hook SECURITY pre
[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (b208ae2415a0ff1503d8e4dea92af81fd731c472),
Jaka Kranjc, 09/17/2016