Skip to Content.
Sympa Menu

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

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 (4096743695a8501a292b5cc2f04b9105a544bab4)
  • Date: Sat, 5 May 2007 17:14:04 -0500

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

var/lib/quill/ChangeLog | 1 +
var/lib/quill/modules/libgpg | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)

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

added another history update; fixed some errors from last commit

diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 81e74a4..ca570c3 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -2,6 +2,7 @@
* libgpg: factored upstream_gpg_ad for more uses in version_bump
removed a stale debug file
fixed missing source url index when substituting
+ added another history update; fixed some errors from last commit
* libupdate: use upstream_gpg_ad in more places
* version: 0.2.6-rc6

diff --git a/var/lib/quill/modules/libgpg b/var/lib/quill/modules/libgpg
index 9554f2a..ab397e1 100644
--- a/var/lib/quill/modules/libgpg
+++ b/var/lib/quill/modules/libgpg
@@ -105,7 +105,8 @@ function convert_to_upstream_gpg() {
sed -i "$si_ln{ x;d }; $s_ln G" DETAILS
s_ln=$(sed -n "/^\s*SOURCE$j=$new_source/=" DETAILS)
fi
- su_ln=$(sed -n "/^\s*SOURCE${j}_URL[^=]*=$SPELL_SIGNATURE/=" DETAILS)
+ SPELL_SIGNATURE=$(sed 's,[][],\\&,g' <<< "$SPELL_SIGNATURE")
+ su_ln=$(sed -n "/^\s*SOURCE${j}_URL\[.*\]=$SPELL_SIGNATURE/="
DETAILS)
if (( $s_ln > $su_ln )); then
sed -i "$su_ln{ x;d }; $s_ln G" DETAILS
fi
@@ -225,6 +226,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"
fi
SPELL_KEYRING=$(basename $SPELL_KEYRING)
fi
@@ -287,7 +289,7 @@ function query_spell_keyring(){
##
## @Globals "source" "sources_and_urls"
#---
-function upstream_gpg_ad
+function upstream_gpg_ad() {
# plug in the ad for upstream sigs if valid urls were found
local su=$(sed -n "s,^$source ,,p" <<< "$sources_and_urls")
guess_signature_url silent &&



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (4096743695a8501a292b5cc2f04b9105a544bab4), Jaka Kranjc, 05/05/2007

Archive powered by MHonArc 2.6.24.

Top of Page