Skip to Content.
Sympa Menu

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

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 (1c67bdad3f5b85f934444d600208b0179ce7fb93)
  • Date: Sun, 3 Dec 2006 13:57:06 -0600

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

ChangeLog | 5 +++++
etc/sorcery/config | 3 ++-
var/lib/sorcery/modules/build_api/common | 18 +++++++++++-------
3 files changed, 18 insertions(+), 8 deletions(-)

New commits:
commit 1c67bdad3f5b85f934444d600208b0179ce7fb93
Author: Andrew Stitt <astitt AT sourcemage.org>
Commit: Andrew Stitt <astitt AT sourcemage.org>

fix bug 13283

diff --git a/ChangeLog b/ChangeLog
index 7a6e78f..734abfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-03 Andrew Stitt <astitt AT sourcemage.org>
+ * build_api/common: gather_docs delineates between files and
+ directories. Now *rc matches config files, but not directories
+ (ie src). Bug 13283.
+
2006-12-02 Andrew Stitt <astitt AT sourcemage.org>
* libsorcery: fix filter() to use a temp file
* libsorcery: ldconfig is pointless when staging
diff --git a/etc/sorcery/config b/etc/sorcery/config
index 005f31c..4a9e152 100755
--- a/etc/sorcery/config
+++ b/etc/sorcery/config
@@ -151,7 +151,8 @@ 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 *rc'
+ DOCS='README* FAQ* CHAN* DOC* SETUP LICENSE COPYING NEWS
*rc'
+ DOC_DIRS='doc* conf'
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 3bc7a8f..5086c03 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -170,22 +170,26 @@ function real_gather_docs() { (

debug "libgrimoire" "Running gather_docs() on $SPELL DOCS=$DOCS"

- DOC_DIR=$DOCUMENT_DIRECTORY/$SPELL
- mkdir -p $DOC_DIR
+ DEST_DIR=$DOCUMENT_DIRECTORY/$SPELL
+ mkdir -p $DEST_DIR

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
+ file -bi $i|grep -q ^application && continue
+ cp $SOURCE_DIRECTORY/${i} $DEST_DIR 2>/dev/null
+ fi
+ done
+
+ for i in ${DOC_DIRS}; do
+ if test -d "$i"; then
+ cp -r $SOURCE_DIRECTORY/${i} $DEST_DIR 2>/dev/null
fi
done

# making installed docs readable for all users.
- chmod -fR a+r $DOC_DIR
+ chmod -fR a+r $DEST_DIR

fi




  • [SM-Commit] GIT changes to master sorcery by Andrew Stitt (1c67bdad3f5b85f934444d600208b0179ce7fb93), Andrew Stitt, 12/03/2006

Archive powered by MHonArc 2.6.24.

Top of Page