Skip to Content.
Sympa Menu

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

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 (800a06242a71d918ac90aa3e968e05c1ef9029e8)
  • Date: Fri, 28 Mar 2008 16:12:48 -0500

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

ChangeLog | 1 +
usr/sbin/cast | 2 +-
usr/sbin/delve | 2 +-
var/lib/sorcery/modules/libgpg | 9 +++++++++
var/lib/sorcery/modules/libsummon | 1 -
5 files changed, 12 insertions(+), 3 deletions(-)

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

libgpg: nicely quit verify_grimoire_tree for alien grimoire trees #14398

commit 4252c0035c7f563b2bd06474bdeedda52818cf5a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

3 comment fixes

diff --git a/ChangeLog b/ChangeLog
index 13fdefd..36884d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
* liblock: save the escaped string in lock_kill_transaction
* libstate: converted two inline esc_str calls to the forkless version
* libcast: reformatted show_download_progress and made it a bit less
dumb
+ * libgpg: nicely quit verify_grimoire_tree for alien grimoire trees
#14398

2008-03-27 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* changed uses of plain sort|uniq to the featurewise equivalent sort
-u
diff --git a/usr/sbin/cast b/usr/sbin/cast
index e6c70e0..c677a1d 100755
--- a/usr/sbin/cast
+++ b/usr/sbin/cast
@@ -242,7 +242,7 @@ function cast_spell() { (
#some minor discussion occured about having this, i'll leave it out for now
activity_log "cast" "$SPELL" "$VERSION" "start"

- # must declare OPS before sourcing config
+ # must declare OPTS before sourcing config
local OPTS
export OPTS
run_spell_config
diff --git a/usr/sbin/delve b/usr/sbin/delve
index 9598b9d..dba3aa2 100755
--- a/usr/sbin/delve
+++ b/usr/sbin/delve
@@ -73,7 +73,7 @@ EOF
function delve_log_helper() {

if ! [[ "$__DELVE_IN_CAST" ]] ; then
- # must declare OPS before sourcing config
+ # must declare OPTS before sourcing config
local OPTS
run_spell_config

diff --git a/var/lib/sorcery/modules/libgpg b/var/lib/sorcery/modules/libgpg
index 682d1cf..91b6fe8 100755
--- a/var/lib/sorcery/modules/libgpg
+++ b/var/lib/sorcery/modules/libgpg
@@ -150,6 +150,15 @@ function verify_grimoire_tree() {
return 253
fi

+ if ! list_find "$GPG_GRIMOIRE_LIST" $grimoire_name &> /dev/null; then
+ message "${MESSAGE_COLOR}The grimoire (tree)" \
+ "${SPELL_COLOR}$grimoire_name" \
+ "${MESSAGE_COLOR}is not an official grimoire and for such" \
+ "${PROBLEM_COLOR}there is no verification method!$DEFAULT_COLOR"
+ query "Continue anyway?" y
+ return $?
+ fi
+
local gpg_pub_key=$(gpg_get_grimoire_key $grimoire_name)
if test -z $gpg_pub_key && test -f $gpg_pub_key ; then
message "No keyring found! (maybe you need to cast sorcery-pubkeys?)"
diff --git a/var/lib/sorcery/modules/libsummon
b/var/lib/sorcery/modules/libsummon
index eaf0e2a..9d779a2 100755
--- a/var/lib/sorcery/modules/libsummon
+++ b/var/lib/sorcery/modules/libsummon
@@ -31,7 +31,6 @@ function summon_spell() {
local SPELL=$1
local rc=1
if [ -n "${SPELL}" ] && lock_resources "summon" "${SPELL}"; then
- #local dl_dir=/tmp/sorcery/summon/${SPELL:-none}
local dl_dir=$TMP_DIR/${SPELL:-none}
debug "libsummon" "dl_dir is $dl_dir"
mkdir -p $dl_dir && pushd $dl_dir &>/dev/null &&



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (800a06242a71d918ac90aa3e968e05c1ef9029e8), Jaka Kranjc, 03/28/2008

Archive powered by MHonArc 2.6.24.

Top of Page