Skip to Content.
Sympa Menu

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

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 (f1519c50b4c486ce4fedc82ecd03dedfaf8a8b62)
  • Date: Sat, 5 May 2007 16:43:13 -0500

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

var/lib/quill/ChangeLog | 7 +++++++
var/lib/quill/modules/libgpg | 27 +++++++++++++++++++++------
var/lib/quill/modules/libupdate | 14 +++-----------
var/lib/quill/version | 2 +-
4 files changed, 32 insertions(+), 18 deletions(-)

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

* libgpg: factored upstream_gpg_ad for more uses in version_bump
removed a stale debug file
fixed missing source url index when substituting
* libupdate: use upstream_gpg_ad in more places

diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index b216e89..81e74a4 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,10 @@
+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
+ fixed missing source url index when substituting
+ * libupdate: use upstream_gpg_ad in more places
+ * version: 0.2.6-rc6
+
2007-05-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* quill: ensure the spell name is unique
* libgpg: created to house all the gpg related functions
diff --git a/var/lib/quill/modules/libgpg b/var/lib/quill/modules/libgpg
index 128db52..9554f2a 100644
--- a/var/lib/quill/modules/libgpg
+++ b/var/lib/quill/modules/libgpg
@@ -63,14 +63,14 @@ function convert_to_upstream_gpg() {
unset SPELL_SIGNATURE
query_spell_signature
done
- substitute_with_variables new_source "$source" {SOURCE$i} \
+ substitute_with_variables new_source "$source" SOURCE$i \
"$SPELL_NAME" {SPELL} "$SPELL_VERSION" {VERSION}

echo
quill_get_spell_keyring

- substitute_with_variables SPELL_SIGNATURE "$su" {SOURCE${i}_URL} \
- "$new_source" {SOURCE$j} "$SPELL_NAME" {SPELL} "$SPELL_VERSION"
{VERSION}
+ substitute_with_variables SPELL_SIGNATURE "$su" {SOURCE${i}_URL[0]} \
+ "$new_source" SOURCE$j "$SPELL_NAME" {SPELL} "$SPELL_VERSION"
{VERSION}

# two modes of new line insertion
# for single-versioned spells we can have the prettier one
@@ -138,15 +138,15 @@ function convert_to_upstream_gpg() {

# ugly, but avoids excessive suing
if query "Do you want to try if the new verification system works?" y;
then
- get_sources_and_urls
+ #get_sources_and_urls
SOURCE_DIRECTORY=$(conditional_get_var SOURCE_DIRECTORY)
codex_get_spell_paths $(codex_find_spell_by_name $SPELL_NAME)
$QUILL_SUDO -c ". /etc/sorcery/config; . $QUILL_MODULES/libcore;
. $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)
+#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=\$?
@@ -282,6 +282,21 @@ function query_spell_keyring(){
}

#---
+## @Synopsis silently check if a signed version of the source exsist
+## @Synopsis and if so, verbosely try to sell it
+##
+## @Globals "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 ,,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"
+}
+
+#---
## @Synopsis Unexpands SOURCE_GPG if necessary to be later able to match it
##
## @Globals "current_check" "version_switch"
diff --git a/var/lib/quill/modules/libupdate b/var/lib/quill/modules/libupdate
index aaac6a0..f6faf39 100644
--- a/var/lib/quill/modules/libupdate
+++ b/var/lib/quill/modules/libupdate
@@ -168,10 +168,6 @@ function version_bump() {
get_sources_and_urls
echo

-# do the silent check for gpg
-# if succesful then convert
-# else continue
-
summon_sources

#update HISTORY - already here, so that the patchlevels come later
@@ -207,18 +203,12 @@ function version_bump() {
continue
fi

- # 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 &&
- 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"
-
# MD5? These contain no :
if ! grep -q ":" <<< "$current_check"; then
new_value=$(count_spaces SOURCE${i}_HASH)
sed -i
"s/^.*MD5\[${i:-0}\]=['\"]*${current_check}['\"]*\s*$/${new_value}SOURCE${i}_HASH=sha512:$hash/"
DETAILS
remove_old_sigs "$version"
+ upstream_gpg_ad

inc_src_num i
continue
@@ -245,12 +235,14 @@ function version_bump() {
gpg --default-key $GURU_GPGKEY -v --digest-algo SHA512 -o
$QUILL_SPELL_DIR/$SPELL_NAME/$source.sig --detach-sign $SOURCE_CACHE/$source
echo
remove_old_sigs "$version"
+ upstream_gpg_ad

inc_src_num i
continue
fi
fi

+ upstream_gpg_ad
# it is either a SOURCE_HASH or the user wants to replace SOURCE_GPG
# SOURCE_GPG usually has unexpanded variables, while we have the
expanded
unexpand_source_gpg || {
diff --git a/var/lib/quill/version b/var/lib/quill/version
index 182e69a..3122995 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.6-rc5
+0.2.6-rc6



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

Archive powered by MHonArc 2.6.24.

Top of Page