Skip to Content.
Sympa Menu

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

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 (2628a7bb47300c2546ee3b0f3d50cb97e9689d8a)
  • Date: Fri, 17 Aug 2007 11:53:42 -0500

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

usr/bin/quill | 30 ++++++++++++++++--------------
var/lib/quill/ChangeLog | 5 +++++
var/lib/quill/modules/libgpg | 17 ++++++++++-------
var/lib/quill/version | 2 +-
4 files changed, 32 insertions(+), 22 deletions(-)

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

* quill: moved the menu definition out of the main loop * libgpg: added
safeguard to prevent multiple gpg ads

diff --git a/usr/bin/quill b/usr/bin/quill
index edb2edb..4732286 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -220,21 +220,23 @@ then
ask_and_copy_over || exit 7
cd $QUILL_SPELL_DIR/$SPELL_NAME

+ actions=('Update the spell to a newer version' \
+ 'Add arbitrary HISTORY entries' \
+ 'Increment/add PATCHLEVEL or SECURITY_PATCH' \
+ 'Switch to upstream gpg verification' \
+ '--NOOP--' \
+ '--NOOP--' \
+ '--NOOP--' \
+ '--NOOP--' \
+ '--NOOP--' \
+ 'Copy it here from the grimoire or QUILL_GIT_DIR' \
+ 'Copy it under QUILL_GIT_DIR' \
+ 'Copy it back to the grimoire' \
+ 'Try it out' \
+ 'Quit' ) #'Manage patches' 'Add a another version'
+
while true; do
- actions=('Update the spell to a newer version' \
- 'Add arbitrary HISTORY entries' \
- 'Increment/add PATCHLEVEL or SECURITY_PATCH' \
- 'Switch to upstream gpg verification' \
- '--NOOP--' \
- '--NOOP--' \
- '--NOOP--' \
- '--NOOP--' \
- '--NOOP--' \
- 'Copy it here from the grimoire or QUILL_GIT_DIR' \
- 'Copy it under QUILL_GIT_DIR' \
- 'Copy it back to the grimoire' \
- 'Try it out' \
- 'Quit' ) #'Manage patches' 'Add a another version'
+ unset QUILL_GPG_AD
echo
query_list "What do you want to do?" ANSWER "Quit" "${actions[@]}"

diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 828e63e..bfa1e65 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -20,6 +20,11 @@
* quill: added necessary calls
put back raa mode

+2007-07-13 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * quill: moved the menu definition out of the main loop
+ * libgpg: added safeguard to prevent multiple gpg ads
+ * version: 0.2.7-rc1
+
2007-07-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libcore: fixed mirror indexing in check_source_urls messages
* libgpg: add the new source url after the last mirror url - fixed
ordering
diff --git a/var/lib/quill/modules/libgpg b/var/lib/quill/modules/libgpg
index d4373ef..110c842 100644
--- a/var/lib/quill/modules/libgpg
+++ b/var/lib/quill/modules/libgpg
@@ -319,15 +319,18 @@ function query_spell_keyring(){
## @return 0 if a valid signature was found
## @return 1 otherwise
##
-## @Globals "source" "sources_and_urls"
+## @Globals QUILL_GPG_AD "source" "sources_and_urls"
#---
function upstream_gpg_ad() {
- # plug in the ad for upstream sigs if valid urls were found
- local su=$(sed -n "s,^$source \(\S*\) .*$,\1,p" <<< "$sources_and_urls")
- guess_signature_url silent &&
- message "${MESSAGE_COLOR}Cool! It looks like this spell would easily be" &&
- message "converted to upstream signing. Please choose that option from" &&
- message "the menu once this update finishes.$DEFAULT_COLOR"
+ if [[ -z $QUILL_GPG_AD ]]
+ # plug in the ad for upstream sigs if valid urls were found
+ local su=$(sed -n "s,^$source \(\S*\) .*$,\1,p" <<< "$sources_and_urls")
+ guess_signature_url silent &&
+ message "${MESSAGE_COLOR}Cool! It looks like this spell would easily be"
&&
+ message "converted to upstream signing. Please choose that option from"
&&
+ message "the menu once this update finishes.$DEFAULT_COLOR"
+ QUILL_GPG_AD=done
+ fi
}

#---
diff --git a/var/lib/quill/version b/var/lib/quill/version
index a0de291..65a3587 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.8-rc5
+0.2.8-rc6



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (2628a7bb47300c2546ee3b0f3d50cb97e9689d8a), Jaka Kranjc, 08/17/2007

Archive powered by MHonArc 2.6.24.

Top of Page