Source Mage code commit list

[scm AT mail.sourcemage.org]

GIT changes to devel sorcery by  <>:

 ChangeLog     |    9 +
 usr/sbin/gaze |  297 
++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 287 insertions(+), 19 deletions(-)

New commits:
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

diff --git a/ChangeLog b/ChangeLog
index 513fde5..b2ceccc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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 2821f64..8c5d314 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -110,6 +110,8 @@ remove-queue        <empty>         View the remove qu
 
 checkmd5s       [spell|section]        Print a md5 check of spells
 
+system-info                                    Show information about a 
Source Mage system
+
 show-held                      Shows all held spells.
 
 show-exiled                    Shows all exiled spells.
@@ -913,31 +915,33 @@ function gaze_show_website()  {
 
 #---------------------------------------------------------------------
 ##
-## Shows the maintainer for the given spell.
-## @param Spell
+## Shows the maintainer for the given section.
+## @param section
 ##
 #---------------------------------------------------------------------
 function show_maintainer()  {
 
-  for section in $@; do
-    ! [[ $GAZE_VERBOSE == 0 ]] &&
-    message "${SPELL_COLOR}${section}:${DEFAULT_COLOR}"
-    SECTION=`codex_find_section_by_name $section`
+  local section="$1"
 
-    if  [  -d  "$SECTION"  ];  then
-
-      if  [  -f  "$SECTION/MAINTAINER"  ];  then
-        cat $SECTION/MAINTAINER
+  {
+    echo  "Grimoire|Section|Maintainer"
+    echo  "--------|-------|----------"
+
+    for GRIMOIRE in $(codex_get_all_grimoires); do
+      codex_set_grimoires $GRIMOIRE
+      SECTION=`codex_find_section_by_name $section`
+      if [[ -d "$SECTION" ]]; then
+        if [[ -f "$SECTION/MAINTAINER" ]]; then
+          echo "$(smgl_basename 
${GRIMOIRE})|$section|$(<$SECTION/MAINTAINER)"
+        else
+          echo "$(smgl_basename ${GRIMOIRE})|$section|-"
+        fi
       else
-        echo "No maintainer available for section '$( basename  $SECTION )'"
+          echo "$(smgl_basename  ${GRIMOIRE})|-|-"
       fi
-
-    else
-
-      echo  "No such section"
-
-    fi
-  done
+      codex_set_grimoires $GRIMOIRES
+    done
+  } | maybe_column -t -s "|"
 
 }
 
@@ -1615,6 +1619,260 @@ function gaze_install() {
 
 #---------------------------------------------------------------------
 ##
+## used by system_info()
+##
+#---------------------------------------------------------------------
+
+function figure_installed()
+{
+       local version
+       version=$(installed_version  $1)
+       if  [  -n  "$version"  ]; then
+               message  "[${version}]"
+       else
+               message  "[not installed]"
+       fi
+}
+
+#---------------------------------------------------------------------
+##
+## displays various information about a Source Mage system
+##
+#---------------------------------------------------------------------
+
+function gaze_system_info()
+{
+  local base_system
+  local cur_spell
+  local section
+  local version
+  local variable
+  local mirror
+  local idx
+  local grimoire
+
+  #---
+  ## Section: ISO VERSION
+  #---
+
+  message -n "${PROBLEM_COLOR}--------------------{"
+  message -n "Section:         ISO VERSION"
+  message    "}--------------------${DEFAULT_COLOR}"
+
+  if [[ -e /etc/sourcemage-release ]]
+  then
+    cat /etc/sourcemage-release | sed '/^$/d'
+  elif [[ -e /etc/smgl.iso ]]
+  then
+    cat /etc/smgl.iso | sed '/^$/d'
+  else
+    message -n "${MESSAGE_COLOR}Couldn't determine what was used to install "
+    message -n "this system. Consider adding some information to "
+    message    "/etc/sourcemage-release${DEFAULT_COLOR}"
+  fi
+
+  #---
+  ## Section: UNAME
+  #---
+
+  message -n "${PROBLEM_COLOR}--------------------{"
+  message -n "Section:               UNAME"
+  message    "}--------------------${DEFAULT_COLOR}"
+
+  uname -a
+
+  #---
+  ## Section: BASESYSTEM
+  #---
+
+  message -n "${PROBLEM_COLOR}--------------------{"
+  message -n "Section:          BASESYSTEM"
+  message    "}--------------------${DEFAULT_COLOR}"
+
+  #---
+  ## Need a list of the base spell and ALL of it's DIRECT
+  ## depends(what's in DEPENDS)
+  ## base_system="$(gaze dependencies basesystem 2 | sed
+  ## -e "s/()//" -e 's/ (depends)//' -e 's/ (optional)//' | tr "\n" " " )"
+  #---
+  
+  compute_installed_depends down_deps
+  for curr_spell in $(hash_get 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
+
+  #---
+  ## Section: CODEX
+  #---
+
+  message -n "${PROBLEM_COLOR}--------------------{"
+  message -n "Section:               CODEX"
+  message    "}--------------------${DEFAULT_COLOR}"
+
+  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}"
+    let idx+=1
+  done
+
+  #---
+  ## Section: SORCERY CONFIG
+  #---
+
+  message -n "${PROBLEM_COLOR}--------------------{"
+  message -n "Section:      SORCERY CONFIG"
+  message    "}--------------------${DEFAULT_COLOR}"
+
+  for variable in PROMPT_DELAY DOWNLOAD_RATE PATCH SOUND SORCERER CABAL \
+                  NICE SORCERY_BRANCH DEF_INSTALL_INIT DEF_ENABLE_INIT \
+                  DEF_INSTALL_XINETD DEF_ENABLE_XINETD DEF_INIT_VS_XINETD \
+                  COMPRESSBIN EXTENSION URL_HTTP_FTP_TIMEOUT MD5SUM_DL \
+                  GPG_VERIFY_SPELL_LEVEL ARCHIVE AUTOFIX UPDATEFIX AUTOPRUNE 
\
+                  GATHER_DOCS MAIL_REPORTS VIEW_REPORTS PRESERVE SUSTAIN \
+                  TMPFS VOYEUR REAP STORE_CONF_LOG NET_SELECT CONFIG_LOC \
+                  CLEAN_SOURCE CROSS_INSTALL SET_TERM_TITLE SCREEN \
+                  DEBUG SUPER_DEBUG BUILD_DIRECTORY
+  do
+    message -n "${MESSAGE_COLOR}$variable="
+    message    "${QUERY_COLOR}\"${!variable}\"${DEFAULT_COLOR}"
+  done
+
+  #---
+  ## Section: STATE CONFIG
+  #---
+
+  message -n "${PROBLEM_COLOR}--------------------{"
+  message -n "Section:        STATE CONFIG"
+  message    "}--------------------${DEFAULT_COLOR}"
+
+  for variable in INSTALL_ROOT STATE_ROOT INSTALL_CACHE TRACK_ROOT
+  do
+    message -n "${MESSAGE_COLOR}$variable="
+    message    "${QUERY_COLOR}\"${!variable}\"${DEFAULT_COLOR}"
+  done
+
+  #---
+  ## Section: COMPILER CONFIG
+  #---
+
+  message -n "${PROBLEM_COLOR}--------------------{"
+  message -n "Section:     COMPILER CONFIG"
+  message    "}--------------------${DEFAULT_COLOR}"
+
+  message -n "${MESSAGE_COLOR}SMGL_COMPAT_ARCHS=${DEFAULT_COLOR}"
+  for each in ${SMGL_COMPAT_ARCHS[@]}
+  do
+    message -n "${QUERY_COLOR}${each}${DEFAULT_COLOR}/"
+  done
+  message -n "\n"
+
+  for variable in ARCHITECTURE OPTIMIZATIONS CUSTOM_CFLAGS CUSTOM_CXXFLAGS \
+                  CUSTOM_LDFLAGS CFLAGS CXXFLAGS LDFLAGS HOST CCACHE \
+                  DISTCC_HOSTS JOBS_PER_HOST MAKE_NJOBS CCACHE_DIR
+  do
+    message -n "${MESSAGE_COLOR}$variable="
+    message    "${QUERY_COLOR}\"${!variable}\"${DEFAULT_COLOR}"
+  done
+
+  #---
+  ## Section: VERIFICATION CONFIG
+  #---
+
+  message -n "${PROBLEM_COLOR}--------------------{"
+  message -n "Section: VERIFICATION CONFIG"
+  message    "}--------------------${DEFAULT_COLOR}"
+
+  for variable in VRF_ALLOWED_LEVELS VRF_ALLOW_NEW_LEVELS VRF_ALLOWED_HASHES 
\
+                  VRF_ALLOW_NEW_HASHES GPG_VERIFY_SORCERY GPG_VERIFY_GRIMOIRE
+  do
+    message -n "${MESSAGE_COLOR}$variable="
+    message    "${QUERY_COLOR}\"${!variable}\"${DEFAULT_COLOR}"
+  done
+
+  #---
+  ## Section: CLEANSE CONFIG
+  #---
+
+  message -n "${PROBLEM_COLOR}--------------------{"
+  message -n "Section:      CLEANSE CONFIG"
+  message    "}--------------------${DEFAULT_COLOR}"
+
+  for variable in FIND_CHECK MD5SUM_CHECK LDD_CHECK SYM_CHECK
+  do
+    message -n "${MESSAGE_COLOR}$variable="
+    message    "${QUERY_COLOR}\"${!variable}\"${DEFAULT_COLOR}"
+  done
+
+  #---
+  ## Section: DISPEL CONFIG
+  #---
+
+  message -n "${PROBLEM_COLOR}--------------------{"
+  message -n "Section:       DISPEL CONFIG"
+  message    "}--------------------${DEFAULT_COLOR}"
+
+  for variable in ORPHAN_MENU_DEFAULT NONORPHAN_MENU_DEFAULT \
+                  RECAST_PARENT_MENU_DEFAULT DISPEL_PARENT_MENU_DEFAULT
+  do
+    message -n "${MESSAGE_COLOR}$variable="
+    message    "${QUERY_COLOR}\"${!variable}\"${DEFAULT_COLOR}"
+  done
+
+  #---
+  ## Section: LOCALE CONFIG
+  #---
+
+  message -n "${PROBLEM_COLOR}--------------------{"
+  message -n "Section:       LOCALE CONFIG"
+  message    "}--------------------${DEFAULT_COLOR}"
+
+  for variable in LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \
+                  LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE \
+                  LC_MEASUREMENT LC_IDENTIFICATION LC_ALL
+  do
+    if [[ ! -z ${!variable} ]]
+    then
+      message -n "${MESSAGE_COLOR}$variable="
+      message    "${QUERY_COLOR}\"${!variable}\"${DEFAULT_COLOR}"
+    fi
+  done
+
+  #---
+  ## Section: FACILITIES
+  #---
+
+  message -n "${PROBLEM_COLOR}--------------------{"
+  message -n "Section:          FACILITIES"
+  message    "}--------------------${DEFAULT_COLOR}"
+
+  cat /etc/sysconfig/facilities | sed -e '/^$/d' -e '/^#.*$/d'
+
+  #---
+  ## Section: MIRRORS
+  #---
+
+  message -n "${PROBLEM_COLOR}--------------------{"
+  message -n "Section:             MIRRORS"
+  message    "}--------------------${DEFAULT_COLOR}"
+
+  for mirror in APACHE_URL CTAN_URL GNOME_URL GNU_URL KDE_URL KERNEL_URL \
+                SORCERY_URL SOURCEFORGE_URL XFREE86_URL CODEX_URL
+  do
+    message -n "${MESSAGE_COLOR}$mirror="
+    message    "${QUERY_COLOR}\"${!mirror}\"${DEFAULT_COLOR}"
+  done
+
+}
+
+#---------------------------------------------------------------------
+##
 ## prints all spells of a given status.
 ## @param status - what are we looking for
 ## @param describe - how is that staus described in english
@@ -1701,9 +1959,10 @@ 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 $@         ;;
          license)  shift; gaze_show_license $@           ;;
            alien)  alien                                 ;;
+     system-info)  gaze_system_info                      ;;
         activity)  display $ACTIVITY_LOG                 ;;
             from)  show_from         $2                  ;;
            newer)  newer             $2                  ;;