Source Mage code commit list

[David Brown <scm AT mail.sourcemage.org>]

GIT changes to devel-stage-root sorcery by David Brown 
<dmlb2000@dmlb2002.(none)>:

 ChangeLog                                |   10 ++++++++++
 etc/sorcery/config                       |    2 +-
 var/lib/sorcery/modules/build_api/common |   20 +++++++++++---------
 var/lib/sorcery/modules/libsummon        |    6 +++++-
 4 files changed, 27 insertions(+), 11 deletions(-)

New commits:
commit 72ea2143506655aca6020f60f76e48cea5e6b8fd
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

    fix bug 13173, add check for empty files in summon sanity checker

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

    fix bug 12869, gather_docs shouldn't gather executables

diff --git a/ChangeLog b/ChangeLog
index 6222df5..812169c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-11-02 Andrew Stitt <astitt AT sourcemage.org>
+       * libsummon: fix bug 13173, add check for empty files in summon
+         sanity checker
+
+2006-11-02 Andrew Stitt <astitt AT sourcemage.org>
+       * etc/sorcery/config: single quote DOCS to prevent premature
+         glob expansion
+       * build_api/common: fix bug 12869, exclude executables from
+         gathered docs. Also did some much needed code cleanup.
+
 2006-10-31 Andrew Stitt <astitt AT sourcemage.org>
        * etc/sorcery/config: remove sorcery path for archspecs
 
diff --git a/etc/sorcery/config b/etc/sorcery/config
index 44dd621..005f31c 100755
--- a/etc/sorcery/config
+++ b/etc/sorcery/config
@@ -151,7 +151,7 @@ GRIMOIRE_MANIFEST_ALGORITHM=sha1
                SCREEN={SCREEN:-off}
 
               GAZE_ALIEN_PATHS="/bin /boot /etc /lib /sbin /usr /var"
-                 DOCS="README* FAQ* CHAN* doc* DOC* conf SETUP LICENSE 
COPYING NEWS"
+                 DOCS='README* FAQ* CHAN* doc* DOC* conf SETUP LICENSE 
COPYING NEWS *rc'
 PROGRESS_SPINNER_CHARS='-\|/'
 
         WHITESPACE_IFS=$' \t\n'
diff --git a/var/lib/sorcery/modules/build_api/common 
b/var/lib/sorcery/modules/build_api/common
index f30acad..6cf3f54 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -151,7 +151,7 @@ ## Gathers all documentation files from 
 ## them as part of the spell
 ##
 #---------------------------------------------------------------------
-function real_gather_docs()  {
+function real_gather_docs()  { (
 
   if  [  "$GATHER_DOCS"  ==  "on"  ]; then
 
@@ -160,21 +160,23 @@ function real_gather_docs()  {
     DOC_DIR=$DOCUMENT_DIRECTORY/$SPELL
     mkdir  -p  $DOC_DIR
 
-    for i in ${DOCS[@]}
-    do
-      cp -r $SOURCE_DIRECTORY/${i} $DOC_DIR 2>/dev/null
+    cd $SOURCE_DIRECTORY
+    shopt -s nullglob
+    for i in ${DOCS}; do
+      if test -f "$i"; then
+        file $i|grep -q executable && continue
+        cp $SOURCE_DIRECTORY/${i} $DOC_DIR 2>/dev/null
+      elif test -d "$i"; then
+        cp -r $SOURCE_DIRECTORY/${i} $DOC_DIR 2>/dev/null
+      fi
     done
 
-    # what is this here for and why isn't it part of the standard DOCS
-    # variable?
-    cp $SOURCE_DIRECTORY/*rc $DOC_DIR 2>/dev/null
-
     # making installed docs readable for all users.
     chmod -fR a+r $DOC_DIR
 
   fi
 
-}
+) }
 
 
 #---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/libsummon 
b/var/lib/sorcery/modules/libsummon
index 97c36b2..b8d9eb7 100755
--- a/var/lib/sorcery/modules/libsummon
+++ b/var/lib/sorcery/modules/libsummon
@@ -418,8 +418,12 @@ ## the correct thing to do). We catch th
 ## file verification to catch it.
 #---------------------------------------------------------------------
 function source_sanity() {
-  [[ "$1" ]] && return 0
+  [[ "$1" ]] || return 0
   [[ "$SUMMON_SANITY" == off ]] && return 0
+  if ! test -s "$1"; then
+    upvar "$2" "Empty"
+    return 1
+  fi
   if [[ "$1" != "${1%.tar.bz2}" ]] ||
      [[ "$1" != "${1%.tar.gz}" ]] ||
      [[ "$1" != "${1%.tgz}" ]]; then