Source Mage code commit list

[Andra?? Levstik <scm AT mail.sourcemage.org>]

GIT changes to master quill by Andra?? Levstik <ruskie AT mages.ath.cx>:

 var/lib/quill/ChangeLog           |    3 ++-
 var/lib/quill/modules/libperlcpan |   38 
+++++++++++++++++++++++---------------
 2 files changed, 25 insertions(+), 16 deletions(-)

New commits:
commit ffeb9278b0e42d6f958604c6a281e808c04e925e
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

    impoved libperlcpan with error checking

diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 3a3a1fc..12c5542 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -10,7 +10,8 @@
          and replaced with the raw url from the page which should be parsable
          with the already existing url fixer(if not that needs an update),
          made it less verbose
-       * libperlcpan: improved the downloading code, less verbose
+       * libperlcpan: improved the downloading code, less verbose, error 
checking
+         for non-existant CPAN modules
 
 2007-02-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * quill, libcore, libhistory, libupdate: fix #13536 by using a dirty 
flag
diff --git a/var/lib/quill/modules/libperlcpan 
b/var/lib/quill/modules/libperlcpan
index 0d08513..5df57b1 100644
--- a/var/lib/quill/modules/libperlcpan
+++ b/var/lib/quill/modules/libperlcpan
@@ -26,21 +26,29 @@ function quill_get_cpan_meta()
 function quill_cpan_core()
 {
   quill_get_cpan_meta $1
-  SPELL_NAME="$(echo ${1} | sed -e 's/::/-/g')"
-  SPELL_SRC_URL="http://www.cpan.org/authors/id/${QUILL_CPAN_INFO[2]}";
-  SPELL_VERSION="${QUILL_CPAN_INFO[1]}"
-  SPELL_SHORT_DESCRIPTION="${QUILL_CPAN_METADATA[6]}"
-  SPELL_LICENSE="ART"
-  
SPELL_URL="http://search.cpan.org/~${QUILL_CPAN_METADATA[7]}/${SPELL_NAME}/";
-  local description
-  description="${QUILL_CPAN_METADATA[6]}"
-  SPELL_NAME="$(echo $SPELL_NAME | tr "A-Z" "a-z")"
-  echo $description > ${QUILL_TMP_DIR}/${SPELL_NAME}
-  BUILDISON="BUILD, "
-  touch ${QUILL_TMP_DIR}/${SPELL_NAME}-BUILD
-  echo "default_build_perl" > ${QUILL_TMP_DIR}/${SPELL_NAME}-BUILD
-  DEPENDSISON="DEPENDS, "
-  SPELL_DEPENDENCIES="perl"
+  if zgrep -q -w -E "^${1}" $QUILL_TMP_DIR/02packages.details.txt.gz ||
+     zgrep -q -w -E "^'${1}'" $QUILL_TMP_DIR/03modlist.data.gz
+  then
+    SPELL_NAME="$(echo ${1} | sed -e 's/::/-/g')"
+    SPELL_SRC_URL="http://www.cpan.org/authors/id/${QUILL_CPAN_INFO[2]}";
+    SPELL_VERSION="${QUILL_CPAN_INFO[1]}"
+    SPELL_SHORT_DESCRIPTION="${QUILL_CPAN_METADATA[6]}"
+    SPELL_LICENSE="ART"
+    
SPELL_URL="http://search.cpan.org/~${QUILL_CPAN_METADATA[7]}/${SPELL_NAME}/";
+    local description
+    description="${QUILL_CPAN_METADATA[6]}"
+    SPELL_NAME="$(echo $SPELL_NAME | tr "A-Z" "a-z")"
+    echo $description > ${QUILL_TMP_DIR}/${SPELL_NAME}
+    BUILDISON="BUILD, "
+    touch ${QUILL_TMP_DIR}/${SPELL_NAME}-BUILD
+    echo "default_build_perl" > ${QUILL_TMP_DIR}/${SPELL_NAME}-BUILD
+    DEPENDSISON="DEPENDS, "
+    SPELL_DEPENDENCIES="perl"
+  else
+    error_msg "Error: unable to find such a CPAN module"
+    return 1
+  fi
+
 }
 
 #---