Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Andrew Stitt (18595caaed9e9526c2becfd1de7fc55fbd8fd9d1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andrew Stitt <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Andrew Stitt (18595caaed9e9526c2becfd1de7fc55fbd8fd9d1)
  • Date: Mon, 3 Jul 2006 19:32:52 -0500

GIT changes to master sorcery by Andrew Stitt <astitt AT sourcemage.org>:

ChangeLog | 5 +++++
usr/sbin/gaze | 24 +++++++++++++++++++-----
var/lib/sorcery/modules/libdepends | 15 +++++++++------
3 files changed, 33 insertions(+), 11 deletions(-)

New commits:
commit 18595caaed9e9526c2becfd1de7fc55fbd8fd9d1
Merge: b2a9922729cf5773729585086cdff2480a915d28
3fad0c2427f7da87e5303b4f18b56500c0833b56
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

Merge branch 'master' of
ssh://astitt AT scm.sourcemage.org/srv/scm/smgl/sorcery

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

further enhancements for bug 11864

diff --git a/ChangeLog b/ChangeLog
index f4232b6..3c2d584 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-03 Andrew Stitt <astitt AT sourcemage.org>
+ * gaze: add uninstalled basesystem depends info to system-info
+ * libdepends: expand compute_installed_*_depends to allow status
+ based selection
+
2006-07-01 David Brown <dmlb2000 AT gmail.com>
* libsorcery: fixed query from previous commit to include a check for
cleanse as well
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index 8c6766a..c6882b9 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -1725,14 +1725,29 @@ function gaze_system_info()
## -e "s/()//" -e 's/ (depends)//' -e 's/ (optional)//' | tr "\n" " " )"
#---

- compute_installed_depends down_deps
- for curr_spell in $(hash_get down_deps basesystem)
+ version="$(figure_installed basesystem)"
+ section="$(codex_get_spell_section_name basesystem)"
+ message -n "${MESSAGE_COLOR}${section}/basesystem:\t"
+ message "${QUERY_COLOR}${version}${DEFAULT_COLOR}\n"
+
+ compute_installed_depends on_down_deps x on
+ compute_installed_depends off_down_deps x off
+ {
+ for curr_spell in $(hash_get on_down_deps basesystem)
do
version="$(figure_installed $curr_spell)"
section="$(codex_get_spell_section_name $curr_spell)"
message -n "${MESSAGE_COLOR}${section}/${curr_spell}:\t"
message "${QUERY_COLOR}${version}${DEFAULT_COLOR}"
done
+ for curr_spell in $(hash_get off_down_deps basesystem)
+ do
+ version="$(figure_installed $curr_spell)"
+ section="$(codex_get_spell_section_name $curr_spell)"
+ message -n "${MESSAGE_COLOR}${section}/${curr_spell}:\t"
+ message "${QUERY_COLOR}${version} (disabled)${DEFAULT_COLOR}"
+ done
+ } | sort

#---
## Section: CODEX
@@ -1745,9 +1760,8 @@ function gaze_system_info()
let idx=0
for grimoire in $(codex_get_all_grimoires)
do
- message -n "${MESSAGE_COLOR} ${QUERY_COLOR}[$idx] :"
- message -n "$(basename "$grimoire")${MESSAGE_COLOR} :"
- message "$grimoire ${DEFAULT_COLOR}"
+ message "${QUERY_COLOR} [$idx]: $(basename
"$grimoire"):${DEFAULT_COLOR}" \
+ "${MESSAGE_COLOR}$grimoire${DEFAULT_COLOR}"
let idx+=1
done

diff --git a/var/lib/sorcery/modules/libdepends
b/var/lib/sorcery/modules/libdepends
index ec627a8..5a18023 100755
--- a/var/lib/sorcery/modules/libdepends
+++ b/var/lib/sorcery/modules/libdepends
@@ -312,19 +312,20 @@ function compute_installed_depends() {
local hash=$1
touch $DEPENDS_STATUS $SPELL_STATUS &>/dev/null

- local pattern
+ local pattern status
if [[ $2 ]] ; then
pattern="required|optional|runtime|suggest"
else
pattern="required|optional"
fi
+ status=${3:-on}

# From here forward $1 and $2 are only used to refer to awk variables

# sub(/(.*)/, "", $2) removes a provider name
- eval $(awk -v pattern="$pattern" -F : 'BEGIN {
+ eval $(awk -v pattern="$pattern" -v status="$status" -F : 'BEGIN {
while (getline < ARGV[1] ) {
- if( $3=="on" && ( $4 ~ pattern ) ) {
+ if( $3==status && ( $4 ~ pattern ) ) {
sub(/\(.*\)/, "", $2);
depmap[$1]=depmap[$1]" "$2" "
}
@@ -348,19 +349,21 @@ function compute_reverse_installed_depen
#$1==hash table to fill
local hash=$1
touch $DEPENDS_STATUS $SPELL_STATUS &>/dev/null
- local pattern
+
+ local pattern status
if [[ $2 ]] ; then
pattern="required|optional|runtime|suggest"
else
pattern="required|optional"
fi
+ status=${3:-on}

# From here forward $1 and $2 are only used to refer to awk variables

# sub(/(.*)/, "", $2) removes a provider name
- eval $(awk -v pattern="$pattern" -F : 'BEGIN {
+ eval $(awk -v pattern="$pattern" -v status="$status" -F : 'BEGIN {
while (getline < ARGV[1] ) {
- if( $3=="on" && ( $4 ~ pattern ) ) {
+ if( $3==status && ( $4 ~ pattern ) ) {
sub(/\(.*\)/, "", $2);
depmap[$2]=depmap[$2]" "$1" "
}



  • [SM-Commit] GIT changes to master sorcery by Andrew Stitt (18595caaed9e9526c2becfd1de7fc55fbd8fd9d1), Andrew Stitt, 07/03/2006

Archive powered by MHonArc 2.6.24.

Top of Page