Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master quill by Andraž Levstik (df11ff831e7925ac4f0a1d5a6f15e565f02b404c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (df11ff831e7925ac4f0a1d5a6f15e565f02b404c)
  • Date: Thu, 15 Mar 2007 10:50:40 -0500

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

generate_tarball.sh | 1 +
var/lib/quill/ChangeLog | 5 +++++
var/lib/quill/modules/libcore | 4 +++-
var/lib/quill/modules/libperlcpan | 12 +++++++++---
var/lib/quill/version | 2 +-
5 files changed, 19 insertions(+), 5 deletions(-)

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

fix perlcpan mode... don't handle caps issues so early in the process

diff --git a/generate_tarball.sh b/generate_tarball.sh
index 8662876..f007408 100755
--- a/generate_tarball.sh
+++ b/generate_tarball.sh
@@ -5,5 +5,6 @@ mkdir ../quill-$MY_VERSION
cd ..
cp -r $CURRENTPWD/* quill-$MY_VERSION/
rm -rf quill-$MY_VERSION/.git quill-$MY_VERSION/usr/bin/quill-old
+rm -rf quill-$MY_VERSION/libgnatest
tar -jcvf quill-$MY_VERSION.tar.bz2 quill-$MY_VERSION
gpg --digest-algo SHA512 -u 117869C9 -b quill-$MY_VERSION.tar.bz2
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index a034165..a1d2b46 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-15 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * libcore: don't mess with the capitalisation so early
+ * libperlcpan: don't grab the metadata until sure we have
+ something to work with
+
2007-03-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libhistory: escape & so sed doesn't print the previous header again
* quill: moved a big chunk of update mode to libupdate
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 4884f03..5c4ad6b 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -464,12 +464,14 @@ Arjan 'abouter' Bouter
#---
## @Synopsis checks if the parameter is missing
## @Synopsis if not, saves it in QUILL_TARGET
+## Don't touch capitalisation... each module should
+## handle that on it's own
#---
function check_parameter() {
[[ -z $1 ]] &&
error_msg "Missing parameter" &&
quill_help 101 ||
- QUILL_TARGET=$(tr '[[:upper:]]' '[[:lower:]]' <<< "$1")
+ QUILL_TARGET="$1"
}

#---
diff --git a/var/lib/quill/modules/libperlcpan
b/var/lib/quill/modules/libperlcpan
index 853a2f4..372c7a3 100644
--- a/var/lib/quill/modules/libperlcpan
+++ b/var/lib/quill/modules/libperlcpan
@@ -1,7 +1,7 @@
#---
## @Synopsis Perl-cpan module to generate spells from perl-cpan metadata
#---
-function quill_get_cpan_meta()
+function quill_get_manifests()
{
# unless someone knows a better way to check files creation time
# this shoud work quite well
@@ -23,8 +23,13 @@ function quill_get_cpan_meta()
ftp://ftp.perl.org/pub/CPAN/modules/03modlist.data.gz ||
(error_msg "Error: unable to fetch 03modlist.data.gz" && return 1)
fi
- eval QUILL_CPAN_INFO="( $(zgrep -w -E "^${1}"
$QUILL_TMP_DIR/02packages.details.txt.gz) )"
+}
+
+function quill_get_cpan_meta(){
+ eval QUILL_CPAN_INFO="( $(zgrep -w -E "^${1}"
$QUILL_TMP_DIR/02packages.details.txt.gz | head -n1) )"
+# zgrep -w -E "^${1}" $QUILL_TMP_DIR/02packages.details.txt.gz | head -n1
eval QUILL_CPAN_METADATA="( $(zgrep -w -B1 -A9 -E "^'${1}'"
$QUILL_TMP_DIR/03modlist.data.gz | tr -d "[]" | sed 's:,$::g' ) )"
+# zgrep -w -B1 -A9 -E "^'${1}'" $QUILL_TMP_DIR/03modlist.data.gz | tr -d
"[]" | sed 's:,$::g'
}

function quill_cpan_core()
@@ -33,10 +38,11 @@ function quill_cpan_core()
# gets properly overwritten later on
SPELL_NAME="$1"

- quill_get_cpan_meta $1
+ quill_get_manifests
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
+ 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]}"
diff --git a/var/lib/quill/version b/var/lib/quill/version
index 5fbdf42..61fc053 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.4-rc7
+0.2.4-rc8



  • [SM-Commit] GIT changes to master quill by Andraž Levstik (df11ff831e7925ac4f0a1d5a6f15e565f02b404c), Andraž Levstik, 03/15/2007

Archive powered by MHonArc 2.6.24.

Top of Page