Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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 (23dccd5716b0190674afe7f81d041989d8a3703d)
  • Date: Thu, 30 Dec 2010 07:59:42 -0600

GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 2 ++
var/lib/sorcery/modules/libtablet | 19 ++++++++++++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)

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

fixed the section name fetching in tablet_set_spell

commit 30087339fa3ef7efb54b809ec5f069605201224e
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libtablet: store the grimoire name in the tablet, part of #8370

diff --git a/ChangeLog b/ChangeLog
index 3dd8f0f..503ad70 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* libtrack, common: newer installwatch has a different log variable
#13873
* libsummon: skip some more files in source_sanity
* config, libsorcery: be a bit more smart about setting the pager
#15793
+ * libtablet: store the grimoire name in the tablet, part of #8370
+ fixed the section name fetching in tablet_set_spell

2010-10-19 Bor Kraljič <pyrobor AT ver.si>
* libsummon: moved sanity check of source to right after download
(#15886)
diff --git a/var/lib/sorcery/modules/libtablet
b/var/lib/sorcery/modules/libtablet
index 87f7c0c..45e1b21 100755
--- a/var/lib/sorcery/modules/libtablet
+++ b/var/lib/sorcery/modules/libtablet
@@ -16,6 +16,7 @@
## $TABLET_PATH/$SPELL/<timestamp>/
## build_api
## depends
+## grimoire_name
## grimoire/<all files from the grimoire dir>
## logs/[install,md5sum,compile] (links to real
files)
## roots (all important FOO_ROOT values)
@@ -255,6 +256,18 @@ function tablet_get_grimoire_file() {
return 0
}

+function tablet_get_grimoire_name() {
+ local tb_dir=$1 tb_version value
+ tablet_get_tb_version $tb_dir tb_version
+ [[ $? != 0 ]] && return 1
+ case $tb_version in
+ 1) test -f $tb_dir/grimoire_name && value=$(<$tb_dir/grimoire_name) ||
return 2 ;;
+ *) return 3 ;;
+ esac
+ eval "$3=\"$value\""
+ return 0
+}
+
function tablet_get_log_file() {
local tb_dir=$1 tb_version value
tablet_get_tb_version $tb_dir tb_version
@@ -476,6 +489,7 @@ function tablet_install_spell_files() {
echo ${SECURITY_PATCH:-0} > security_patch
echo $BUILD_API > build_api
echo $SECTION > section_name
+ echo $GRIMOIRE_NAME > grimoire_name
echo installed > status # this could be held or something else

# SPELL_CONFIG and persistent variables
@@ -540,9 +554,12 @@ function tablet_set_spell() {
SCRIPT_DIRECTORY=$SPELL_DIRECTORY/spell
SECTION_DIRECTORY=$SPELL_DIRECTORY/section
GRIMOIRE=$SPELL_DIRECTORY/grimoire
+ if [[ -f $SPELL_DIRECTORY/grimoire_name ]]; then
+ GRIMOIRE_NAME=$(<$SPELL_DIRECTORY/grimoire_name)
+ fi

# Names
- SECTION=$(<$SPELL_DIRECTORY/section)
+ SECTION=$(<$SPELL_DIRECTORY/section_name)

SPELL_CONFIG="$SPELL_DIRECTORY/spell_config"
if [ -f $SPELL_CONFIG ]; then



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (23dccd5716b0190674afe7f81d041989d8a3703d), Jaka Kranjc, 12/30/2010

Archive powered by MHonArc 2.6.24.

Top of Page