Skip to Content.
Sympa Menu

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

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 (0ea4c8a3f386da67e3e208f15566bd36f18966b1)
  • Date: Sun, 11 Mar 2007 10:39:11 -0500

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

usr/bin/quill | 10 +++++-----
var/lib/quill/ChangeLog | 4 ++++
var/lib/quill/modules/libcore | 11 ++++++++---
var/lib/quill/version | 2 +-
4 files changed, 18 insertions(+), 9 deletions(-)

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

quill: loop until the source urls are fixed
libcore: made check_source_urls have a consistent return value

diff --git a/usr/bin/quill b/usr/bin/quill
index e7eb4c5..d152605 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -205,13 +205,13 @@ then
#check for multiversion spells
multiversion_check

- # reparse the (usually new) source urls
+ # parse the (usually new) source urls
get_sources_and_urls

- # check that (usually new) source urls are ok
- check_source_urls
-
- # reparse the possibly new source urls and company
+ while ! check_source_urls; do
+ get_sources_and_urls
+ done
+ # do it again, needed if the source suffix was changed
get_sources_and_urls
echo

diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 936dcf2..f991f97 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * quill: loop until the source urls are fixed
+ * libcore: made check_source_urls have a consistent return value
+
2007-03-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libbuild: fix syntax error

diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index ed0ef68..915c7ec 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -286,9 +286,12 @@ function quill_purge() {
#---
## @Synopsis checks if spell source urls are valid
## @Synopsis and perhaps changes them if they are trivially fixable
+##
+## @return 0 if all source urls are either valid or just not trivially
checkable
+## @return 1 otherwise
#---
function check_source_urls() {
- local i= su old_su oldest_su source old_source
+ local i= su old_su oldest_su source old_source rc

message "Checking source urls (this may take a while) ..."
for su in $source_urls
@@ -297,6 +300,7 @@ function check_source_urls() {
if [[ $? == 0 ]]
then
message "SOURCE${i}_URL[0] is ok!"
+ rc=0
else
# first retry with a changed suffix
old_su="$su"
@@ -359,18 +363,19 @@ function check_source_urls() {
sed -i "s,$old_source,$source," DETAILS
add_history_entry "DETAILS: Changed SOURCE${i} extension"
fi
-
+ rc=0
else
# if they are still not ok ask for fixed ones
error_msg "SOURCE${i}_URL[0] is hopelessly broken! Fix it manually."
sleep 2
quill_edit DETAILS
+ rc=1
fi
fi
[[ ! $i ]] && i=1
let i+=1
done
-
+ return $rc
}

#---
diff --git a/var/lib/quill/version b/var/lib/quill/version
index c220aa4..9b3d9dc 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.4-rc4
\ No newline at end of file
+0.2.4-rc5



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (0ea4c8a3f386da67e3e208f15566bd36f18966b1), Jaka Kranjc, 03/11/2007

Archive powered by MHonArc 2.6.24.

Top of Page