Skip to Content.
Sympa Menu

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

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 (5f179a02346754ffd5b31581a236f7c9ec9b94f2)
  • Date: Fri, 20 Apr 2007 11:07:01 -0500

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

usr/bin/quill | 6 +++++-
var/lib/quill/ChangeLog | 7 +++++++
var/lib/quill/modules/libcopy | 8 +++++---
var/lib/quill/modules/libcore | 1 +
var/lib/quill/version | 2 +-
5 files changed, 19 insertions(+), 5 deletions(-)

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

* libcopy: don't make assumptions about dir count in copy_new_to_git
fix validation looping not to print an error the first time
* quill: loop until a valid url is provided
* libcore: echo another newline in get_spell_source

diff --git a/usr/bin/quill b/usr/bin/quill
index f405ed7..9614128 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -12,7 +12,7 @@
## @Globals SPELL_UPDATED SPELL_NAME actions ANSWER WEB_SITE GRIMOIRE SECTION
## @Globals SPELL_DEPENDENCIES SPELL_OPTIONAL_DEPENDENCIES SPELL_CONFLICTS
## @Globals SPELL_PROVIDES PREPAREISON PREBUILDISON BUILDISON SPELL_SRC_FILE
-## @Globals INSTALLISON BS BUILD_DTFILE
+## @Globals INSTALLISON BS BUILD_DTFILE SPELL_SRC_URL
##
## @Thanks BearPerson, dufflebunk, afrayedknot
## @Thanks To all testers
@@ -278,6 +278,10 @@ then
else
query_spell_name
query_spell_source_url
+ # the semirandom fallback url is there to circumvent sorcery bug #13729
+ while ! url_verify "${SPELL_SRC_URL:-ftp://34tqgsad}"; > /dev/null; do
+ query_spell_source_url
+ done
query_spell_license
query_spell_url
query_spell_short_description
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 2b52281..e49c2d3 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-20 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libcopy: don't make assumptions about dir count in copy_new_to_git
+ fix validation looping not to print an error the first time
+ * quill: loop until a valid url is provided
+ * libcore: echo another newline in get_spell_source
+ * version: 0.2.4-rc17
+
2007-04-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libcore: removed check_url and check_source_url for the better
url_verify
* libcore, quill: converted above calls to url_verify
diff --git a/var/lib/quill/modules/libcopy b/var/lib/quill/modules/libcopy
index d6a668d..6e49e14 100644
--- a/var/lib/quill/modules/libcopy
+++ b/var/lib/quill/modules/libcopy
@@ -5,19 +5,21 @@
#---
function copy_new_to_git()
{
- local grimoire=n0n-eXsistENt section=n0n-eXsistENt
+ local grimoire section
if [[ -z $QUILL_GIT_DIR ]]
then
error_msg "\$QUILL_GIT_DIR is empty, run quill -r to set it!"
echo
+ return 1
else
- find "$QUILL_GIT_DIR" -maxdepth 1 -type d -printf "%P "
- echo
+ find "$QUILL_GIT_DIR" -maxdepth 1 -type d -printf "%P\n" | column
+ query_string grimoire "Which of the above is the target git grimoire? "
while ! dir_check "$QUILL_GIT_DIR/$grimoire"; do
query_string grimoire "Which of the above is the target git grimoire? "
done
echo
find "$QUILL_GIT_DIR/$grimoire" -maxdepth 1 -type d -printf "%P\n" |
column
+ query_string section "Which section do you want to put it in? "
while ! dir_check "$QUILL_GIT_DIR/$grimoire/$section"; do
query_string section "Which section do you want to put it in? "
done
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 34b3944..ec823d5 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -47,6 +47,7 @@ function get_spell_source(){
else
wget -c "${SPELL_SRC_URL}"
fi
+ echo
cd ${QUILL_SPELL_DIR}/${SPELL_NAME}
}

diff --git a/var/lib/quill/version b/var/lib/quill/version
index a0fdc67..28149bb 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.4-rc16
+0.2.4-rc17



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (5f179a02346754ffd5b31581a236f7c9ec9b94f2), Jaka Kranjc, 04/20/2007

Archive powered by MHonArc 2.6.24.

Top of Page