Skip to Content.
Sympa Menu

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

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 (e420785c8b935fa4dcf139459fe9baefe1242fdb)
  • Date: Sat, 1 Sep 2007 10:37:49 -0500

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

todo | 1 +
usr/bin/quill | 6 ++++--
var/lib/quill/ChangeLog | 9 ++++++++-
var/lib/quill/modules/libcore | 1 +
var/lib/quill/modules/libhistory | 24 ++++++++++++++++--------
var/lib/quill/version | 2 +-
6 files changed, 31 insertions(+), 12 deletions(-)

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

* libhistory: simplified HISTORY addition and added a fallback for
those
broken perlcpan spells
* libcore: added Alexander to the credits
* quill: prettified the source url check loop; added some coloring

diff --git a/todo b/todo
index e689edc..c73917d 100644
--- a/todo
+++ b/todo
@@ -32,6 +32,7 @@ modules:
overall:
* Improve scripting support to make it possible to write alternate
interfaces for it
* add quill mode to /quillrc to avoid the need to constantly pass it
+ * wrapping for too long history additions

ads:
<p3pilot> i am a believer in using quill for updates...very few failures
and is just quicker for me
\ No newline at end of file
diff --git a/usr/bin/quill b/usr/bin/quill
index 9fd7b6f..14eff40 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -358,7 +358,7 @@ else
SPELL_NAME=${SPELL_NAME:-$QUILL_TARGET}
query_spell_name
while codex_does_spell_exist $SPELL_NAME > /dev/null; do
- message "This spell name is already taken!"
+ error_msg "This spell name is already taken!"
gaze short $SPELL_NAME
unset SPELL_NAME
echo
@@ -367,6 +367,8 @@ else
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
+ error_msg "Invalid URL!"
+ unset SPELL_SRC_URL
query_spell_source_url
done
query_spell_license
@@ -509,7 +511,7 @@ else
done
unset source sources sources_and_urls source_urls

- add_history
+ add_history "spell created"
quill_set_executable_bit
if query "Do you want to edit all the spell files?" n
then
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 3fd3e64..86c0612 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,4 +1,11 @@
-2007-07-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+2007-09-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libhistory: simplified HISTORY addition and added a fallback for
those
+ broken perlcpan spells
+ * libcore: added Alexander to the credits
+ * quill: prettified the source url check loop; added some coloring
+ * version: 0.2.8-rc9
+
+2007-08-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* quill, libcore: fixed argument being lost when no option was passed
* HACKING: added with some notes
* version: 0.2.8-rc8
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 159f49b..598ad71 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -368,6 +368,7 @@ Jaka 'lynxlynxlynx' Kranjc
Juuso 'iuso' Alasuutari

Contributions by:
+Alexander 'astsmtl' Tsamutali
Andrew 'afrayedknot' Stitt
Arjan 'abouter' Bouter
"
diff --git a/var/lib/quill/modules/libhistory
b/var/lib/quill/modules/libhistory
index 9a8aa16..6147992 100644
--- a/var/lib/quill/modules/libhistory
+++ b/var/lib/quill/modules/libhistory
@@ -2,19 +2,20 @@
## @Synopsis libhistory
#---

+## @param entry without the leading tab, bullet and space
##
-## @Globals HISTORY_DATE GURU_NAME GURU_EMAIL PROVIDESISON DEPENDSISON
-## @Globals CONFIGUREISON PREPAREISON CONFLICTSISON PREBUILDISON BUILDISON
-## @Globals INSTALLISON POSTINSTALLISON TRIGGERSISON FINALISON BUILD_DTFILE
+## @Globals HISTORY_DATE GURU_NAME GURU_EMAIL
function add_history()
{
-message "Generating HISTORY file ..."
+ local title="$HISTORY_DATE $GURU_NAME <$GURU_EMAIL>" files
+
+ message "Generating HISTORY file ..."

-echo \
-"${HISTORY_DATE} ${GURU_NAME} <${GURU_EMAIL}>
- * DETAILS,
${PROVIDESISON}${DEPENDSISON}${CONFIGUREISON}${PREPAREISON}${CONFLICTSISON}${PREBUILDISON}${BUILDISON}${INSTALLISON}${POSTINSTALLISON}${TRIGGERSISON}${FINALISON}HISTORY${BUILD_DTFILE}:
created spell" > HISTORY
+ files=$(echo * | sed -e 's, \S*\.sign* , ,g; s, \S*\.asc , ,g' -e 's/ /,
/g')
+ echo > HISTORY
+ sed -i "1 s%^.*$%$title\n\t* ${files/HISTORY/}, HISTORY: $1\n%" HISTORY

-message "Done."
+ message "Done."

}

@@ -28,6 +29,13 @@ function add_history_entry()
{
local title="$HISTORY_DATE $GURU_NAME <$GURU_EMAIL>" file

+ if [[ ! -e HISTORY ]]; then
+ error_msg "Spell is missing a HISTORY file!"
+ [[ -e DETAILS.orig ]] && mv DETAILS.orig ..
+ add_history "added missing HISTORY file"
+ [[ -e ../DETAILS.orig ]] && mv ../DETAILS.orig .
+ fi
+
if grep -q "$title" HISTORY;
then
# check if we already have an entry for the same file
diff --git a/var/lib/quill/version b/var/lib/quill/version
index 25031ed..3278ff9 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.8-rc8
+0.2.8-rc9



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (e420785c8b935fa4dcf139459fe9baefe1242fdb), Jaka Kranjc, 09/01/2007

Archive powered by MHonArc 2.6.24.

Top of Page