Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master quill by Andra?? Levstik (02a0e80712cd1ffc2a8827eea7474d231a8d0f91)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andra?? Levstik <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master quill by Andra?? Levstik (02a0e80712cd1ffc2a8827eea7474d231a8d0f91)
  • Date: Sat, 17 Feb 2007 08:45:03 -0600

GIT changes to master quill by Andra?? Levstik <ruskie AT mages.ath.cx>:

usr/bin/quill | 2 +-
var/lib/quill/ChangeLog | 4 ++++
var/lib/quill/modules/libcore | 4 ++++
var/lib/quill/version | 2 +-
4 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 02a0e80712cd1ffc2a8827eea7474d231a8d0f91
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

respect gpg key id

diff --git a/usr/bin/quill b/usr/bin/quill
index 2fbf041..f6d2600 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -302,7 +302,7 @@ then
if ! query "Do you want to replace SOURCE${i}_GPG with a
hash?" n
then
# sign it and continue
- gpg -v --digest-algo SHA512 -o
$QUILL_SPELL_DIR/$SPELL_NAME/$source.sig --detach-sign $SOURCE_CACHE/$source
+ 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"

diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index fe9dc1d..f9e4d24 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-17 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * libcore: added GURU_GPGKEY to quillrc
+ * quill: respect quillrc
+
2007-02-12 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libhistory: use an obscure sed field delimiter, always mark as
changed
* version: 0.2.2-2007-02-12
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index f1ef215..4886b82 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -93,6 +93,9 @@ function quill_rc() {
else
QUILL_SUDO="su"
fi
+ if query "Do you use guru GPG signatures?" n ; then
+ query_list "${QUERY_COLOR}Please select one of the following keys as
the guru signing key${DEFAULT_COLOR}" GURU_GPGKEY "" $(gpg -K | sed -n "/sec/
s,sec\s*[^/]*/\(\S*\)\s.*$,\1,p")
+ fi
message "Thank you. Now generating ${QUILL_QUILLRC}"
cat << QUA > $QUILL_QUILLRC
QUILL_CONFIG_VERSION="$quill_version"
@@ -101,6 +104,7 @@ function quill_rc() {
QUILL_SPELL_DIR="$QUILL_SPELL_DIR"
QUILL_GIT_DIR="$QUILL_GIT_DIR"
QUILL_SUDO="$QUILL_SUDO"
+ GURU_GPGKEY="$GURU_GPGKEY"
QUA
mkdir -p "$QUILL_SPELL_DIR" "$QUILL_GIT_DIR"
exit 0
diff --git a/var/lib/quill/version b/var/lib/quill/version
index 49be5d2..cc10880 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.2-2007-02-12
+0.2.2-2007-02-17



  • [SM-Commit] GIT changes to master quill by Andra?? Levstik (02a0e80712cd1ffc2a8827eea7474d231a8d0f91), Andra?? Levstik, 02/17/2007

Archive powered by MHonArc 2.6.24.

Top of Page