sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master quill by Andra?? Levstik (f25df048d6df96e344c359acecfe0e7919142a17)
- From: Andra?? Levstik <scm AT mail.sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master quill by Andra?? Levstik (f25df048d6df96e344c359acecfe0e7919142a17)
- Date: Sun, 25 Feb 2007 11:15:54 -0600
GIT changes to master quill by Andra?? Levstik <ruskie AT mages.ath.cx>:
var/lib/quill/ChangeLog | 3 +++
var/lib/quill/modules/libdetails | 23 +++++++++++++++--------
var/lib/quill/version | 2 +-
3 files changed, 19 insertions(+), 9 deletions(-)
New commits:
commit f25df048d6df96e344c359acecfe0e7919142a17
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>
minor fixup of the hunt_src_dir function to handle unsupported formats
nicer
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 12c5542..31815bd 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,6 @@
+2007-02-25 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * libdetails: improved the hunt_src_dir function
+
2007-02-24 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* quill: added ruby-raa mode
* libcore: added ruby-raa mode
diff --git a/var/lib/quill/modules/libdetails
b/var/lib/quill/modules/libdetails
index c66fb16..5346ffd 100644
--- a/var/lib/quill/modules/libdetails
+++ b/var/lib/quill/modules/libdetails
@@ -158,16 +158,23 @@ fi
#---
## @Synopsis Assign to SPELL_SRC_DIR the source dir inside a tarball,
-## @return 0 if a tarball
-## @return 1 if not a tarball.
+## @return 0 if found supported fromat and suceeded
+## @return 1 if failed
+## @return 2 if unsupported format
#---
function hunt_src_dir(){
- message "Checking what is in the tarball ..."
- SPELL_SRC_DIR=$(tar tf "${QUILL_TMP_DIR}/${SPELL_SRC_FILE}" | grep / | sed
-e "s=/.*$==g;q")
- if [[ $? != 0 ]]; then
- message "Not a tarball."
- unset SPELL_SRC_DIR
- return 1
+ local compressor
+ message "Checking for the source directory..."
+ compressor=$(guess_compressor ${QUILL_TMP_DIR}/${SPELL_SRC_FILE}
+ case "$compresor" in
+ bzip2|gzip|compress*|tar) SPELL_SRC_DIR=$(tar tf
"${QUILL_TMP_DIR}/${SPELL_SRC_FILE}" | \
+ grep / | \
+ sed -e "s=/.*$==g;q") || \
+ (error_msg "Error: getting
path from tarball" && \
+ return 1) ;;
+ *) SPELL_SRC_DIR=${SPELL}-${VERSION} &&
+ message "Unsupported format" &&
+ return 2 ;;
fi
message "Done.\n"
}
diff --git a/var/lib/quill/version b/var/lib/quill/version
index 80b8da4..35c84da 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.2-2007-02-24
+0.2.2-2007-02-25
- [SM-Commit] GIT changes to master quill by Andra?? Levstik (f25df048d6df96e344c359acecfe0e7919142a17), Andra?? Levstik, 02/25/2007
Archive powered by MHonArc 2.6.24.