[SM-Commit] GIT changes to master quill by Jaka Kranjc (3f1d3d89ee0b6c7f694bed0af72d67150d03ef8c)

Jaka Kranjc scm at sourcemage.org
Sun May 6 15:15:11 EDT 2007


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

 usr/bin/quill                |    6 ++++++
 var/lib/quill/ChangeLog      |    6 ++++++
 var/lib/quill/modules/libgpg |   12 +++++++-----
 var/lib/quill/version        |    2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

New commits:
commit 3f1d3d89ee0b6c7f694bed0af72d67150d03ef8c
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    	* quill: check for upstream sigs when creating spells too
    	* libgpg: improve a history addition message
    	  one needs the signed data too to guess the signing key

diff --git a/usr/bin/quill b/usr/bin/quill
index 689c082..3aba6c1 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -453,6 +453,12 @@ else
     add_desktop_file
   fi
 
+  local source sources sources_and_urls source_urls
+  get_sources_and_urls
+  for source in $sources; do
+    upstream_gpg_ad && break
+  done
+
   add_history
   quill_set_executable_bit
   if query "Do you want to edit all the spell files?" n
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index ca570c3..92a3262 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-06 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+	* quill: check for upstream sigs when creating spells too
+	* libgpg: improve a history addition message
+	  one needs the signed data too to guess the signing key
+	* version: 0.2.6-rc7
+
 2007-05-05 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* libgpg: factored upstream_gpg_ad for more uses in version_bump
 	  removed a stale debug file
diff --git a/var/lib/quill/modules/libgpg b/var/lib/quill/modules/libgpg
index ab397e1..f13da27 100644
--- a/var/lib/quill/modules/libgpg
+++ b/var/lib/quill/modules/libgpg
@@ -146,8 +146,6 @@ function convert_to_upstream_gpg() {
       . $QUILL_MODULES/libcopy; . $QUILL_MODULES/libupdate
       SPELL_NAME=$SPELL_NAME; QUILL_SPELL_DIR=$QUILL_SPELL_DIR
       get_sources_and_urls
-#SOURCE_DIRECTORY=$(conditional_get_var SOURCE_DIRECTORY)
-#codex_get_spell_paths $(codex_find_spell_by_name $SPELL_NAME)
       summon_sources || exit 1
       quill_final_put_in_grimoire $GRIMOIRE $SECTION no
       delve -c start PRE_BUILD $SPELL_NAME; rc=\$?
@@ -226,7 +224,7 @@ function quill_get_spell_keyring() {
         message "Copying the keyring to the spell dir as it is not a grimoire"
         message "level one, from the same section nor from the same spell!\n"
         cp $GRIMOIRE/$SPELL_KEYRING "$QUILL_SPELL_DIR/$SPELL_NAME"
-        add_history_entry "$SPELL_KEYRING: added gpg keyring"
+        add_history_entry "${SPELL_KEYRING##*/}: added gpg keyring from $kr_path"
       fi
       SPELL_KEYRING=$(basename $SPELL_KEYRING)
     fi
@@ -234,7 +232,7 @@ function quill_get_spell_keyring() {
   else
     # get a hint from the failed verification
     message "Creating a keyring from the key that made the signature ..."
-    $QUILL_SUDO -c "wget -nc -P $SOURCE_CACHE $SPELL_SIGNATURE"
+    $QUILL_SUDO -c "wget -nc -P $SOURCE_CACHE $SPELL_SIGNATURE ${SPELL_SIGNATURE%.*}"
     # get the key id, reuse a var
     SPELL_KEYRING=$(gpg --verify $SOURCE_CACHE/${SPELL_SIGNATURE##*/} 2>&1 | sed -n 's,^.* key ID ,,p')
 
@@ -254,7 +252,8 @@ function quill_get_spell_keyring() {
       wget -nc -P $QUILL_SPELL_DIR/$SPELL_NAME/ "$SPELL_KEYRING"
       SPELL_KEYRING=$(basename "$SPELL_KEYRING")
     fi
-    rm $QUILL_SPELL_DIR/$SPELL_NAME/*.gpg~
+
+    rm -f $QUILL_SPELL_DIR/$SPELL_NAME/*.gpg~
     add_history_entry "$SPELL_KEYRING: added gpg keyring"
   fi
 
@@ -287,6 +286,9 @@ function query_spell_keyring(){
 ## @Synopsis silently check if a signed version of the source exsist
 ## @Synopsis and if so, verbosely try to sell it
 ##
+## @return 0 if a valid signature was found
+## @return 1 otherwise
+##
 ## @Globals "source" "sources_and_urls"
 #---
 function upstream_gpg_ad() {
diff --git a/var/lib/quill/version b/var/lib/quill/version
index 3122995..d55f328 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.6-rc6
+0.2.6-rc7



More information about the SM-Commit mailing list