Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-stage-root sorcery by David Brown

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Brown <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-stage-root sorcery by David Brown
  • Date: Sun, 4 Jun 2006 23:58:12 -0500

GIT changes to devel-stage-root sorcery by David Brown <dmlb2000 AT gmail.com>:

ChangeLog | 17 ++++++++--
usr/sbin/gaze | 61
+++++++++++++++++++++++++++++++++++--
var/lib/sorcery/modules/libdepends | 21 +++++++++---
3 files changed, 89 insertions(+), 10 deletions(-)

New commits:
commit 13240b7852d04ba728febc4af4aec5ac147b5a2d
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

fixed depends_message to have the correct function

commit afc55dd5d66ed84ca9c68bbd6c70a856505a1403
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

Revert "forgot to merge these changes"
got the wrong duplicate function

This reverts 914c288d36e36a5a4cfc1cc906d4527a19d9f8cc commit.

commit 914c288d36e36a5a4cfc1cc906d4527a19d9f8cc
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

forgot to merge these changes

commit 40073a02f69ad6f3d8f8e84c3dba170d2eb216b4
Merge: a26fced... 51a6d3e...
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

merged changes from devel manually

commit 51a6d3eea7609936c8162e0cd43b2a68fbed6d78
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

fix bug 12603, add special case handling for answers of no to optional
depends on providers

commit 6b512d81c10dddc0d443da49d0e61cc112df653d
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

fix bug 11858, add gaze patchlevels sub-command

commit 5a371c49ac907f82095a9a64fb61fcaac293afc8
Merge: 62f6edd... ee80631...
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

Merge branch '11740'

Conflicts:

ChangeLog

commit ee80631dbd1695bf18fd00a205ec128ec339d469
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

factor cast --queue code out of argument parsing, doing this fixes the
return code issues

commit 62f6eddbae2f12212546c33989e597d90e885b49
Merge: 6ee1f91... f70b117...
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

Merge branch '11902'

commit 6ee1f91f1f4aac4ed00f5c68b8be23f79e2e978e
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

forgot *

commit 26a9582e7352c6ed49874c22d56b7dab877b74f7
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

fix bug 12327

commit 5bbff845c2c92fbdd7f3b1b78db17f05dbba8877
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

workaround bash 3.0 brokenness

commit f70b117c83926df0af3b134778c1bc13810c5ae2
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

fix bug 11902, multi-spell conflicts

commit b1aad488ff632b35b292adfc7f0771c2cf357984
Merge: dd55abb... 3fe57ac... 2c96a46...
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

Merge branches '11864' and '10459'

commit 3fe57aca0c3a80d78785a3636e3fb7841647450c
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

fix bug 11864, add gaze system-info

commit 2c96a46d5ec5175656ae0aff21ee5ce5ab9f18d1
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

fix bug 10459, make gaze maintainer show the grimoire

commit dd55abb091f02a130784f20528daec1150f7f65b
Author: Andrew Stitt <afrayedknot@thefrayedknot.(none)>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

update build to work with git (first real git based commit)

commit 67ad1617a25f16e2fde82d7f33f968908d16d66c
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

fix location of changelog entries
(cherry picked from 5b2692d5af4f708215462f247ee5a118b37563fe commit)

commit 46010b6e2d3687aa4a94f12a54c682e0caab9495
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

------------------------------------------------------------
revno: 35
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack5
timestamp: Fri 2006-05-12 10:02:59 -0700
message:
fix bug 11413, untar permissions

commit 72d9590e2ca92fe0e9b4620a38837221fddb46d5
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 34
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack5
timestamp: Fri 2006-05-12 09:15:57 -0700
message:
fix bug 11767

commit 5bd8851b55fe328fb79b63b74838716d54f5c24f
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 33
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack5
timestamp: Thu 2006-05-11 08:51:53 -0700
message:
fix typo

commit 87d7589f67df31ccda68f351a2a00159510d1109
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 32
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Tue 2006-05-09 21:48:19 -0700
message:
add -g parameter to cast

commit e67fbf0277e76efd5d903c78b3420034713558f3
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 31
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Tue 2006-05-09 21:33:08 -0700
message:
remove cast --fix and --nofix

commit f8f7656ad0555591ab3ec2a21b59beabff1d60a5
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 30
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Tue 2006-05-09 21:24:30 -0700
message:
fix spelling nit

commit e9c9052ba69208e78936b1703ca1070b4b4b1ad8
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 29
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Tue 2006-05-09 20:57:35 -0700
message:
teach gaze dependencies about new functions

commit 810ec2761107ebbda5175fd67b411ac431df66c6
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 28
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Tue 2006-05-09 20:53:20 -0700
message:
add runtime/suggested dependencies bugs 10110 and 10790

commit ac87ffdff207c34f745f93f9bacbc907f851cb95
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 27
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Wed 2006-05-03 09:27:27 -0700
message:
fix bug 10528, install_config_files marks files as new or old

commit b3a8f0411a8d4a5202f24a1ca29e991217d89118
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 26
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Wed 2006-05-03 09:22:22 -0700
message:
fix bug 10465, gaze grimoire selection

commit 2635c57b2b1a09dae8f366964850664efc2b3dee
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 25
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Mon 2006-05-01 22:31:38 -0700
message:
fix search for default provider

commit 6305bb07d751c5aa3b745550f434fe2f58bc8155
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 24
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Sun 2006-04-23 18:48:18 -0700
message:
fix bug 8070, make changelog viewing timeout

commit 4f2f2b547a8363498c33ba47b8181b0b9169525d
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 23
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Sun 2006-04-23 17:46:00 -0700
message:
fix bug 9415, add some sanity checking to summon

commit 649593b0499154149897f5c4ee1b9233d866eef6
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 22
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Sun 2006-04-23 17:11:10 -0700
message:
svn should be non-interactive

commit 9d56d7a31b6944dc7304caf183e3aef491dde5f2
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 21
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel
timestamp: Fri 2006-04-21 08:31:15 -0700
message:
fix bug 11372, and some other summon issues

commit f5b27264b908eb4f887b60b0a53327f0f64bd28e
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 20
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel
timestamp: Fri 2006-04-14 09:11:56 -0700
message:
fix bug 9386 -- optimize tablet_import_repair_files
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060414070549-73f8d2b8f9a06a26
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack3
timestamp: Fri 2006-04-14 00:05:49 -0700
message:
Optimize tablet_import_repair_files, now runs about 10 times faster.
Completes in about 6 seconds for me, compared with over 60 seconds.

* Removed all but one fork (from codex in-memory cache creation).
* Replace codex_set_current_spell_by_name with
codex_get_spell_paths and
hash_get_ref on the in-memory cache.
* Move tablet lookups for version, updated, and patchlevel to
tablet_check_repair_file, so they are only run when actually
needed.
* replace find -type f -mindepth 1 -maxdepth 1 .... with glob
pattern
plus a [[ -f ]]
* use smgl_basename and smgl_dirname where possible
* replace $(cat) with $(<)

Also had to update cleanse routines since they tie into the repair
file routines
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060414061038-ccd58caf381a28c4
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack3
timestamp: Thu 2006-04-13 23:10:38 -0700
message:
add function to pass up hash values by reference instead of using
stdout
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060414060954-9cd051f486683914
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack3
timestamp: Thu 2006-04-13 23:09:54 -0700
message:
improve in-memory cache creation by providing an option to only
store
info for spells that are actually installed (easy 10x speedup
for typical installs)
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060414043631-fe729b362d0cfd7f
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack3
timestamp: Thu 2006-04-13 21:36:31 -0700
message:
add routines to create in-memory spell lookup table
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060414043417-6913968692c52e4d
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack3
timestamp: Thu 2006-04-13 21:34:17 -0700
message:
move common code for setting spell paths into a seperate function
this is one of many things necessary to make
tablet_import_repair_files as
fast as possible
------------------------------------------------------------
merged: astitt AT sourcemage.org-20060414041654-c932672e93e14ae0
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack3
timestamp: Thu 2006-04-13 21:16:54 -0700
message:
add smgl_basename and smgl_dirname functions

commit 9b92eb7dd6d38315c6e155d89c3cc7176af6e478
Author: root <root@courier>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 19
committer: root <root@courier>
branch nick: devel
timestamp: Thu 2006-04-13 21:07:42 -0700
message:
fix bug 10282

commit 28bb8993753bc9422e3c0ceee4dec19db36a9b8a
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 18
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Wed 2006-04-12 09:34:02 -0700
message:
fix bug 10682

commit 61539f5190d9cc90c2af3eec7d81529eb4971adc
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 17
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack4
timestamp: Wed 2006-04-12 09:22:33 -0700
message:
fix bug 10144

commit 949d33bf75cc5b3b283587a7af9f207adba46c04
Author: Andrew Stitt <afrayedknot@thefrayedknot>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 16
committer: Andrew Stitt <afrayedknot@thefrayedknot>
branch nick: devel
timestamp: Sat 2006-04-08 11:28:17 -0700
message:
fix bug 10855 and 10900

commit 5aaac07eaec35ba84c4860e4a665c1654ddaa908
Author: Andrew Stitt <afrayedknot@thefrayedknot>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 15
committer: Andrew Stitt <afrayedknot@thefrayedknot>
branch nick: devel
timestamp: Thu 2006-04-06 16:05:30 -0700
message:
fix bug 10869

commit 030d038abec496b1c5e683e6282a7f65b28f4eb7
Author: Andrew Stitt <afrayedknot@thefrayedknot>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 14
committer: Andrew Stitt <afrayedknot@thefrayedknot>
branch nick: devel
timestamp: Wed 2006-04-05 12:12:59 -0700
message:
merge changes from lynxlynxlynx. modified removal of $ to be \$.
------------------------------------------------------------
merged: jakakranjc AT email.si-20060405134200-64dce620d0902f7e
committer: Jaka Kranjc <jakakranjc AT email.si>
branch nick: sorcery-devel
timestamp: Wed 2006-04-05 15:42:00 +0200
message:
update?
------------------------------------------------------------
merged: jakakranjc AT email.si-20060403170110-652215b453dd1556
committer: Jaka Kranjc <jakakranjc AT email.si>
branch nick: sorcery-devel
timestamp: Mon 2006-04-03 19:01:10 +0200
message:
removed two "$" from help to prevent expanding to null
------------------------------------------------------------
merged: jakakranjc AT email.si-20060403164157-369e2d9de99836c1
committer: Jaka Kranjc <jakakranjc AT email.si>
branch nick: sorcery-devel
timestamp: Mon 2006-04-03 18:41:57 +0200
message:
added support for viewing {,PRE_}SUB_DEPENDS files to gaze

commit 9319723afac5bf4d0cf3bc0d39a32b4255bfbde6
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 13
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Tue 2006-04-04 21:06:53 -0700
message:
fix bug 10538

commit 6b674e71843855dcd009db60572f61bf19204e09
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 12
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack3
timestamp: Tue 2006-04-04 20:12:28 -0700
message:
fix bug 10357

commit f2a0ca1b91396ec0469e4ea85678c6fde74b7fb2
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 8
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Mon 2006-04-03 09:11:57 -0700
message:
add svn_https handler, bug 10370

commit 2307225332fdc071a9b79430c1dc4614959dbf24
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 7
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Mon 2006-04-03 09:06:01 -0700
message:
fix bug 10588

commit 7a2b419dd5c5a06030bf6fe6c7916b8a174e57da
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 6
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-hack2
timestamp: Sun 2006-04-02 19:49:54 -0700
message:
version value now gets filled in by the build script

commit a94533ff7e585cccb6c17e0c0575b0701d37438f
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 5
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel
timestamp: Sun 2006-04-02 19:16:43 -0700
message:
fix bug 10183

commit ac8fdf1b8c7f335001cafdfd0b4ec76cb3a16325
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <afrayedknot@thefrayedknot.(none)>

------------------------------------------------------------
revno: 4
committer: Andrew Stitt <astitt AT sourcemage.org>
branch nick: devel-clean
timestamp: Sun 2006-04-02 18:17:54 -0700
message:
add support for building from bzr repos

diff --git a/ChangeLog b/ChangeLog
index fe0120b..e0b4b45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-03 Andrew Stitt <astitt AT sourcemage.org>
+ * libdepends: fix bug 12603, optional depends on a provider does not
+ properly remember defaults of none.
+
+2006-05-28 Andrew Stitt <astitt AT sourcemage.org>
+ * gaze: add patchlevels subcommand, bug 11858
+
+2006-05-28 Andrew Stitt <astitt AT sourcemage.org>
+ * cast: factor cast --queue code out of argument parsing, fixed bug
11740
+
2006-05-28 Andrew Stitt <astitt AT sourcemage.org>
* libcast: fix bug 11902, conflicts are broken for multi-spell
conflicts

@@ -10,13 +20,14 @@
intialization of local arrays is broken.

2006-05-28 Andrew Stitt <astitt AT sourcemage.org>
- * cast: factor cast --queue code out of argument parsing, fixed bug
11740
-
-2006-05-28 Andrew Stitt <astitt AT sourcemage.org>
* gaze: add system-info command, bug 11864, patch supplied
by Andra?? Levstik. Additionally modified to print basesystem
depends and changed SMGL_COMPAT_ARCHS printing to be more robust.

+2006-05-28 Andrew Stitt <astitt AT sourcemage.org>
+ * gaze: fix bug 10459, enhance gaze maintainer, apply patch from
+ Jaka Kranjc
+
2006-05-23 Andrew Stitt <astitt AT sourcemage.org>
* build: update to work with git

diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index 8c5d314..9bc38a3 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -39,7 +39,9 @@ install-spell spell Views an install l
installed [spell] Views installed spells.
version spell Views version of spell installed,
and version in the grimoire.
-versions spell Views version of spell in the in all grimoires
+versions spell Views version of spell in all grimoires
+patchlevels spell Views PATCHLEVEL and SECURITY_PATCH value
+ of spell in all grimoires
license spell Views the license of the given
spell(s)
license section Views the licenses of spells in the
given
section(s)
@@ -1128,6 +1130,60 @@ function gaze_show_versions() {
echo
}

+#---------------------------------------------------------------------
+##
+## Shows the all versions of spell, all versions in all grimoires and
+## the version installed on the system.
+## @param Spell
+##
+#---------------------------------------------------------------------
+function gaze_show_patchlevels() {
+
+ local SPELL=$1
+
+ if ! codex_does_spell_exist $SPELL
+ then return 1
+ fi
+
+ local TB_DIR
+ tablet_find_spell_dir "$SPELL" TB_DIR
+
+ local I_PATCH
+ local I_SPATCH
+ tablet_get_patchlevel "$TB_DIR" I_PATCH
+ tablet_get_security_patch "$TB_DIR" I_SPATCH
+
+
+ local ECHO_INSTALLED=1
+ (
+
+ echo "Grimoire|Spell|Grimoire |Grimoire |Installed |Installed"
+ echo " | |Regula |Security |Regular |Security"
+ echo " | |Patchlevel|Patchlevel|Patchlevel|Patchlevel"
+ echo "--------|-----|----------|----------|----------|----------"
+
+ for GRIMOIRE in $(codex_get_all_grimoires)
+ do
+ if SPELL_DIRECTORY=$(codex_cache_spell_lookup $SPELL $GRIMOIRE)
+ then
+ codex_set_current_spell $SPELL_DIRECTORY
+
+ if [ $ECHO_INSTALLED -eq 1 ]; then
+ echo
"$GRIMOIRE_NAME|$SPELL|${PATCHLEVEL:-"0"}|${SECURITY_PATCH:-"0"}|${I_PATCH:-0}|${I_SPATCH:-0}"
+ ECHO_INSTALLED=0
+ else
+ echo
"$GRIMOIRE_NAME|$SPELL|${PATCHLEVEL:-0}|${SECURITY_PATCH:-0}|-|-"
+ fi
+
+ else
+ echo "$(basename $GRIMOIRE)|-|-|-|-|-"
+ fi
+ done
+
+ ) | maybe_column -t -s "|"
+
+ echo
+}


#---------------------------------------------------------------------
@@ -1959,7 +2015,8 @@ parse() {
import) import_snapshot $2 ;;
section) shift; gaze_show_section $@ ;;
version) shift; gaze_show_version $@ ;;
- versions) shift; gaze_show_versions $@ ;;
+ versions) shift; gaze_show_versions $@ ;;
+ patchlevels) shift; gaze_show_patchlevels $@ ;;
license) shift; gaze_show_license $@ ;;
alien) alien ;;
system-info) gaze_system_info ;;
diff --git a/var/lib/sorcery/modules/libdepends
b/var/lib/sorcery/modules/libdepends
index 186d8ef..6cee737 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -1019,19 +1019,30 @@ function work_optional_depends_provider(
local CANDIDATES=$( find_providers $1)
# if not reconfiguring check if theres already an answer in DEPENDS_STATUS
if [[ ! $RECONFIGURE ]]; then
- explode "$(search_depends_status $DEPENDS_STATUS "$SPELL" ".*($1)")" ":"
"status"
+ explode "$(search_depends_status_simple $DEPENDS_STATUS "$SPELL"
".*($1)" "on")" ":" "status"
local tmp=${status[1]%(*} # Name of spell which provides $1
- if spell_ok $tmp &&
+ if [[ "$tmp" ]] && spell_ok "$tmp" &&
query "Continue to use ${SPELL_COLOR}$tmp${DEFAULT_COLOR}?" y; then
private_common_depends "$tmp($1)" "on" "$database_term" "$2" "$3"
return 0
fi
+ if [[ "$(search_depends_status_simple $DEPENDS_STATUS \
+ "$SPELL" ".*($1)" "off")" ]] &&
+ query "Continue to use ${SPELL_COLOR}[none]${DEFAULT_COLOR}?" y; then
+ private_common_depends "$tmp($1)" "off" "$database_term" "$2" "$3"
+ return 0
+ fi
fi

# check if theres an abandoned answer, but only if its still a provider
if [[ ! $default ]] && [ -e $ABANDONED_DEPENDS/$SPELL ] ; then
- tmp=$(search_depends_status $ABANDONED_DEPENDS/$SPELL "$SPELL"
".*($1)"|awk -F: '{print $2;exit}')
- [[ $tmp ]] && echo $CANDIDATES|grep -q "\<$tmp\>" && default=$tmp
+ tmp=$(search_depends_status_simple $ABANDONED_DEPENDS/$SPELL "$SPELL"
".*($1)" "on"|awk -F: '{print $2;exit}')
+ if [[ $tmp ]] && echo $CANDIDATES|grep -q "\<$tmp\>" ; then
+ default=$tmp
+ else
+ tmp=$(search_depends_status_simple $ABANDONED_DEPENDS/$SPELL "$SPELL"
".*($1)" "off")
+ [[ $tmp ]] && default=none
+ fi
fi

# check if theres a default provider
@@ -1526,7 +1537,7 @@ function depends_message() {
message -n " ${SPELL_COLOR}${3}${DEFAULT_COLOR}"
fi
if [[ $# -ge 4 ]] ; then
- message -n " ($4)"
+ message -n " $4"
fi
message ""
}



  • [SM-Commit] GIT changes to devel-stage-root sorcery by David Brown, David Brown, 06/05/2006

Archive powered by MHonArc 2.6.24.

Top of Page