Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master quill by Jaka Kranjc (e8726e7609fbd25395cf4076805f04109ab12785)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master quill by Jaka Kranjc (e8726e7609fbd25395cf4076805f04109ab12785)
  • Date: Mon, 24 Jul 2006 08:54:20 -0500

GIT changes to master quill by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

var/lib/quill/ChangeLog | 3 ++
var/lib/quill/modules/libfreshmeatxml | 44
++++++++++++++++++++--------------
2 files changed, 29 insertions(+), 18 deletions(-)

New commits:
commit e8726e7609fbd25395cf4076805f04109ab12785
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libfreshmeatxml: add check for non-exsisting projects; fix indentation

diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index b303a2d..dbd6796 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,6 @@
+2006-07-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libfreshmeatxml: add check for non-exsisting projects; fix
indentation
+
2006-07-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* install.sh: added INSTALL_ROOT support, ensured it is ran from
where
it is expected to, simplified the copying/removing logic
diff --git a/var/lib/quill/modules/libfreshmeatxml
b/var/lib/quill/modules/libfreshmeatxml
index 8368f4b..66cb02a 100644
--- a/var/lib/quill/modules/libfreshmeatxml
+++ b/var/lib/quill/modules/libfreshmeatxml
@@ -43,24 +43,32 @@ function quill_fmxml_core(){
unset FILE
fi

-# fill in variables from xml file
-if [[ $1 ]] ; then
- SPELL_NAME=$(quill_fmxml_grab_from_xml projectname_short $1|tr 'A-Z' 'a-z')
- for each in url_bz2 url_tgz; do
- TMP=$(quill_fmxml_grab_from_xml $each $1)
- if [[ $TMP ]] ; then
- SPELL_SRC_URL=$(quill_fmxml_hunt_src_url $SPELL_NAME $TMP)
- break
+ # check that the project was found - exsists
+ local not_found='Error: project not found.'
+ if grep -q "$not_found" "$QUILL_TMP_DIR/$1.xml"; then
+ message "$PROBLEM_COLOR$not_found$DEFAULT_COLOR"
+ rm "$QUILL_TMP_DIR/$1.xml"
+ exit 2
+ fi
+
+ # fill in variables from xml file
+ if [[ $1 ]] ; then
+ SPELL_NAME=$(quill_fmxml_grab_from_xml projectname_short $1|tr 'A-Z'
'a-z')
+ for each in url_bz2 url_tgz; do
+ TMP=$(quill_fmxml_grab_from_xml $each $1)
+ if [[ $TMP ]] ; then
+ SPELL_SRC_URL=$(quill_fmxml_hunt_src_url $SPELL_NAME $TMP)
+ break
+ fi
+ done
+ SPELL_URL=$(curl -I $(quill_fmxml_grab_from_xml url_homepage $1) 2>&1|\
+ grep Location|awk '{print $2}'|sed 's/\r//g')
+
+ SPELL_LICENSE=$(quill_fmxml_grab_from_xml license $1)
+ if grep -q "(.*)" <<< "$SPELL_LICENSE"; then
+ SPELL_LICENSE=$(awk '{print $NF}' <<< "$SPELL_LICENSE" | tr -d '()')
fi
- done
- SPELL_URL=$(curl -I $(quill_fmxml_grab_from_xml url_homepage $1) 2>&1|\
- grep Location|awk '{print $2}'|sed 's/\r//g')
-
- SPELL_LICENSE=$(quill_fmxml_grab_from_xml license $1)
- if grep -q "(.*)" <<< "$SPELL_LICENSE"; then
- SPELL_LICENSE=$(awk '{print $NF}' <<< "$SPELL_LICENSE" | tr -d '()')
+ SPELL_SHORT_DESCRIPTION=$(quill_fmxml_grab_from_xml desc_short $1|sed
's/\r//g')
+ quill_fmxml_grab_from_xml desc_full $1 |fmt >
${QUILL_TMP_DIR}/${SPELL_NAME}
fi
- SPELL_SHORT_DESCRIPTION=$(quill_fmxml_grab_from_xml desc_short $1|sed
's/\r//g')
- quill_fmxml_grab_from_xml desc_full $1 |fmt >
${QUILL_TMP_DIR}/${SPELL_NAME}
-fi
}



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (e8726e7609fbd25395cf4076805f04109ab12785), Jaka Kranjc, 07/24/2006

Archive powered by MHonArc 2.6.24.

Top of Page