Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (b208ae2415a0ff1503d8e4dea92af81fd731c472)

Chronological Thread  
    < 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 (b208ae2415a0ff1503d8e4dea92af81fd731c472)
  • Date: Sat, 17 Sep 2016 18:24:06 +0000
GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

var/lib/sorcery/modules/build_api/api1 | 16 ++++++++--------
var/lib/sorcery/modules/build_api/api2 | 26 +++++++++++++-------------
var/lib/sorcery/modules/build_api/common | 8 ++++----
var/lib/sorcery/modules/libcast | 4 ++--
4 files changed, 27 insertions(+), 27 deletions(-)

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

more bash 4.4 substitution fixes

diff --git a/var/lib/sorcery/modules/build_api/api1
b/var/lib/sorcery/modules/build_api/api1
index 71c4132..c181415 100755
--- a/var/lib/sorcery/modules/build_api/api1
+++ b/var/lib/sorcery/modules/build_api/api1
@@ -23,7 +23,7 @@
## a spell for BUILD_API 1.
#---------------------------------------------------------------------
function run_build_spell() {
- debug "build_api/api1" "run_build_spell"
+ debug "build_api1" "run_build_spell"
C_LOG=$TMP_DIR/$SPELL.compile.log
C_FIFO=/dev/stdout
STAGED_INSTALL=off
@@ -82,7 +82,7 @@ function run_build_spell() {
#---------------------------------------------------------------------
function run_pre_build() {

- debug "build_api/api1" "run_pre_build()"
+ debug "build_api1" "run_pre_build()"
message "${MESSAGE_COLOR}Building" \
"${SPELL_COLOR}${SPELL}" \
"${DEFAULT_COLOR}"
@@ -102,7 +102,7 @@ function run_pre_build() {
#---------------------------------------------------------------------
function run_build() {

- debug "build_api/api1" "Starting run_build()"
+ debug "build_api1" "Starting run_build()"

echo "Compile log for $SPELL $VERSION Built on `date -u`" > $C_LOG
echo "Using gcc version: `gcc -dumpversion`" >> $C_LOG
@@ -144,7 +144,7 @@ function run_build() {
#---------------------------------------------------------------------
function run_post_build() {

- debug "build_api/api1" "Starting run_post_build()"
+ debug "build_api1" "Starting run_post_build()"
run_spell_file POST_BUILD post_build

# Lock made in prepare_install
@@ -160,7 +160,7 @@ function run_post_build() {
#---------------------------------------------------------------------
function run_post_install() {

- debug "build_api/api1" "Starting run_post_install()"
+ debug "build_api1" "Starting run_post_install()"
run_spell_file INSTALL install
}

@@ -172,7 +172,7 @@ function run_post_install() {
#---------------------------------------------------------------------
function real_default_sorcery_pre_build() {

- debug "build_api/api1" "Starting real_default_sorcery_pre_build() -
SOURCE=$SOURCE SOURCE_DIRECTORY=$SOURCE_DIRECTORY"
+ debug "build_api1" "Starting real_default_sorcery_pre_build() -
SOURCE=$SOURCE SOURCE_DIRECTORY=$SOURCE_DIRECTORY"
mk_source_dir $SOURCE_DIRECTORY &&
unpack_file

@@ -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() {

- debug "build_api/api1" "Starting real_default_sorcery_post_build()"
+ debug "build_api1" "Starting real_default_sorcery_post_build()"

install_xinetd
install_initd
diff --git a/var/lib/sorcery/modules/build_api/api2
b/var/lib/sorcery/modules/build_api/api2
index 0682cda..a5b87a0 100755
--- a/var/lib/sorcery/modules/build_api/api2
+++ b/var/lib/sorcery/modules/build_api/api2
@@ -25,7 +25,7 @@
## a spell for BUILD_API 2.
#---------------------------------------------------------------------
function run_build_spell() {
- debug "build_api/api2" "run_build_spell"
+ debug "build_api2" "run_build_spell"

local CHROOT_CHECK=""

@@ -127,7 +127,7 @@ function run_build_spell() {
#---------------------------------------------------------------------
function run_pre_build() {

- debug "build_api/api2" "run_pre_build()"
+ debug "build_api2" "run_pre_build()"
message "${MESSAGE_COLOR}Preparing" \
"${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}"

@@ -147,7 +147,7 @@ function run_pre_build() {
#---------------------------------------------------------------------
function run_build() {

- debug "build_api/api2" "Starting run_compile()"
+ debug "build_api2" "Starting run_compile()"

echo "Compile log for $SPELL $VERSION Built on `date -u`" > $C_LOG
echo "Using gcc version: `gcc -dumpversion`" >> $C_LOG
@@ -185,7 +185,7 @@ function run_build() {
## run_build finished, then runs PRE_INSTALL or default_pre_install
#---------------------------------------------------------------------
function run_pre_install() {
- debug "build_api/api2" "Starting run_pre_install()"
+ debug "build_api2" "Starting run_pre_install()"

if [ -f $S_PWD ] ; then
cd "`cat $S_PWD`"
@@ -211,7 +211,7 @@ function run_pre_install() {
## stage root properly
#---------------------------------------------------------------------
function run_install() {
- debug "build_api/api2" "Starting run_install()"
+ debug "build_api2" "Starting run_install()"

if [[ $STAGED_INSTALL == on ]]; then
message "${MESSAGE_COLOR}Installing" \
@@ -242,7 +242,7 @@ function run_install() {

function run_install_extras() {

- debug "build_api/api2" "Starting run_install_extras()"
+ debug "build_api2" "Starting run_install_extras()"
run_spell_file INSTALL_EXTRAS install_extras
}

@@ -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() {

- debug "build_api/api2" "Starting real_default_sorcery_install_extras"
+ debug "build_api2" "Starting real_default_sorcery_install_extras"
install_xinetd
install_initd
install_pam_confs
@@ -394,7 +394,7 @@ function real_default_sorcery_install_extras() {

function real_default_sorcery_transfer() {

- debug "build_api/api2" "Starting real_default_sorcery_transfer"
+ debug "build_api2" "Starting real_default_sorcery_transfer"
transfer_staged_spell
}

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"

# update depends info
- debug "build_api/common" "Merging depends info"
+ debug "build_api_common" "Merging depends info"

# 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

Archive powered by MHonArc 2.6.24.

Top of Page