Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master quill by Jaka Kranjc (9bb8d8839c19e7f1bb8787c8586ee56f2dfdaf58)
  • Date: Sat, 14 Apr 2007 12:08:04 -0500

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

var/lib/quill/ChangeLog | 8 ++++++++
var/lib/quill/modules/libcore | 11 ++++++-----
var/lib/quill/modules/libfreshmeatxml | 4 ++--
var/lib/quill/modules/libperlcpan | 4 ++--
var/lib/quill/modules/librubyraa | 2 +-
5 files changed, 19 insertions(+), 10 deletions(-)

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

+ * libperlcpan, libfreshmeatxml, librubyraa: fix "retrieve" typos
+ * libcore: forgot to delete the temporary long.description
+ improved andand_lines to be idempotent

diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 2f9802b..c0cd475 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libperlcpan, libfreshmeatxml, librubyraa: fix "retrieve" typos
+ * version: 0.2.4-rc15
+
+2007-04-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libcore: forgot to delete the temporary long.description
+ improved andand_lines to be idempotent
+
2007-04-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libcore: made the url checkers timeout after 30s
* libcore, quill: added check_description_wrap
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 75c2c5f..f0b6fab 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -461,13 +461,14 @@ function dir_check() {
}

#---
-## @Synopsis adds && to all full lines not ending by and escape \ or last
line
+## @Synopsis adds && to all full lines not already ending with &&, \
+## @Synopsis or being the last line
##
## @Globals none
#---
function andand_lines() {
local file="$1"
- sed -e 's/^ *$//' -e 's/[^\\]$/& \&\&/' "$file" |
+ sed -e 's/^ *$//' -e 's/[^\\&]\s*$/& \&\&/' "$file" |
tac |
awk '{ if (removed!=1){ if (sub("&&$","") > 0){ removed=1 }}; print }' |
tac > "temporary-$file"
@@ -515,16 +516,16 @@ function check_description_wrap(){
sed -n '/cat *<< *EOF/,/EOF/p' DETAILS > long.description
awk '{ if(length($0)>a) a=length($0)} \
END{if(a>80)exit 1; else exit 0}' \
- long.description && return 0
+ long.description && rm long.description && return 0

sed -i '/cat *<< *EOF/,/EOF/d' DETAILS
- sed -i '1d; $d' long.description
- fmt -w 80 long.description > long.description.2
+ sed '1d; $d' long.description | fmt -w 80 > long.description.2
mv long.description.2 long.description
echo 'cat << EOF' >> DETAILS
cat long.description >> DETAILS
echo 'EOF' >> DETAILS
add_history_entry "DETAILS: fixed long description wrap"
+ rm long.description

}

diff --git a/var/lib/quill/modules/libfreshmeatxml
b/var/lib/quill/modules/libfreshmeatxml
index e440ae8..a217754 100644
--- a/var/lib/quill/modules/libfreshmeatxml
+++ b/var/lib/quill/modules/libfreshmeatxml
@@ -31,7 +31,7 @@ function quill_fmxml_core() {
FRESHMEAT_FILE="${QUILL_TMP_DIR}/${1}.xml"
FRESHMEAT_PROJECT_FILE="${QUILL_TMP_DIR}/${1}.fm"
if [[ ! -e ${FRESHMEAT_PROJECT_FILE} ]]; then
- message -n "Attempting to retrive project page ... "
+ message -n "Attempting to retrieve project page ... "
wget -q -Uquill -O ${FRESHMEAT_PROJECT_FILE} "${FRESHMEAT_PROJECT_URL}"
||
{ error_msg "Error: unable to fetch project page" && return 1; }
tr "\r" " " < ${FRESHMEAT_PROJECT_FILE} > ${FRESHMEAT_PROJECT_FILE}.tmp
@@ -40,7 +40,7 @@ function quill_fmxml_core() {
fi

if [[ ! -e ${FRESHMEAT_FILE} ]]; then
- message -n "Attempting to retrive project XML page ... "
+ message -n "Attempting to retrieve project XML page ... "
wget -q -Uquill -O ${FRESHMEAT_FILE} "${FRESHMEAT_XML_URL}" ||
{ error_msg "Error: unable to fetch project XML page" && return 1; }
message "Done"
diff --git a/var/lib/quill/modules/libperlcpan
b/var/lib/quill/modules/libperlcpan
index 5bfecbe..0ce9c46 100644
--- a/var/lib/quill/modules/libperlcpan
+++ b/var/lib/quill/modules/libperlcpan
@@ -15,12 +15,12 @@ function quill_get_manifests()
[[ ! -f $QUILL_TMP_DIR/03modlist.data.gz ]]
then
cd $QUILL_TMP_DIR
- message "Attempting to retrive 02packages.details.txt.gz..."
+ message "Attempting to retrieve 02packages.details.txt.gz..."
wget -q \
-O 02packages.details.txt.gz \
ftp://ftp.perl.org/pub/CPAN/modules/02packages.details.txt.gz ||
(error_msg "Error: unable to fetch 02packages.details.txt.gz" &&
return 1)
- message "Attempting to retrive 03modlist.data.gz..."
+ message "Attempting to retrieve 03modlist.data.gz..."
wget -q \
-O 03modlist.data.gz \
ftp://ftp.perl.org/pub/CPAN/modules/03modlist.data.gz ||
diff --git a/var/lib/quill/modules/librubyraa
b/var/lib/quill/modules/librubyraa
index cee95ba..7f08f23 100644
--- a/var/lib/quill/modules/librubyraa
+++ b/var/lib/quill/modules/librubyraa
@@ -26,7 +26,7 @@ function quill_raa_core(){
SPELL_NAME="$1"
project="$(tr 'A-Z' 'a-z' <<< $1 )"
raa_project_file=${QUILL_TMP_DIR}/${project}.raa
- message "Attempting to retrive project page..."
+ message "Attempting to retrieve project page..."
wget -q -O $raa_project_file.tmp \
http://raa.ruby-lang.org/project/$project/ || \
error_msg "Error: unable to fetch project page" && \



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (9bb8d8839c19e7f1bb8787c8586ee56f2dfdaf58), Jaka Kranjc, 04/14/2007

Archive powered by MHonArc 2.6.24.

Top of Page