Skip to Content.
Sympa Menu

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

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 (256c24f57b1638a3bc013128db07005abf001561)
  • Date: Sat, 30 Jun 2007 09:22:08 -0500

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

todo | 5 ++++-
usr/bin/quill | 6 +++---
var/lib/quill/ChangeLog | 6 ++++++
var/lib/quill/modules/libgpg | 8 +++++---
var/lib/quill/version | 2 +-
5 files changed, 19 insertions(+), 8 deletions(-)

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

* quill: fixed local varibles and synced 13001 workaround
* libgpg: added import-minimal to the key generator
fixed success typos

diff --git a/todo b/todo
index a757ade..fdb17ae 100644
--- a/todo
+++ b/todo
@@ -1,4 +1,4 @@
-post 0.2 things that would be cool to have done:
+things that would be cool to have:
new menu choices
* 'Manage patches'
add/remove them and their references in PRE_BUILD
@@ -30,3 +30,6 @@ documentation:
overall:
* Improve scripting support to make it possible to write alternate
interfaces for it
* add quill mode to /quillrc to avoid the need to constantly pass it
+
+ads:
+ <p3pilot> i am a believer in using quill for updates...very few failures
and is just quicker for me
\ No newline at end of file
diff --git a/usr/bin/quill b/usr/bin/quill
index 3aba6c1..5469140 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -139,9 +139,9 @@ function url_ftp_verify() {
if [ -n "$URL" ]; then
local FILENAME=`basename $URL`
local DIRECTORY=`dirname $URL`
- local OUTPUT=`wget --passive-ftp -t 1 -T 30 -O - --spider
--no-remove-listing "$DIRECTORY/" 2>&1`
+ local OUTPUT=`wget --passive-ftp -t 1 -T 30 -O - --spider -S
"$DIRECTORY/" 2>&1`

- if grep -q "$FILENAME" .listing; then
+ if grep -q "$FILENAME" <<< "$OUTPUT"; then
rm -f .listing
else
echo $OUTPUT | sed 's/LIST.*//g'
@@ -453,11 +453,11 @@ 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
+ unset source sources sources_and_urls source_urls

add_history
quill_set_executable_bit
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 92a3262..ba9d939 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * quill: fixed local varibles and synced 13001 workaround
+ * libgpg: added import-minimal to the key generator
+ fixed success typos
+ * version: 0.2.6-rc8
+
2007-05-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* quill: check for upstream sigs when creating spells too
* libgpg: improve a history addition message
diff --git a/var/lib/quill/modules/libgpg b/var/lib/quill/modules/libgpg
index f13da27..ad5f970 100644
--- a/var/lib/quill/modules/libgpg
+++ b/var/lib/quill/modules/libgpg
@@ -151,7 +151,7 @@ function convert_to_upstream_gpg() {
delve -c start PRE_BUILD $SPELL_NAME; rc=\$?
rm -r $SOURCE_DIRECTORY
if [[ \$rc == 0 ]]; then
- message "Succes!"
+ message "Success!"
else
error_msg "Failed!"
fi
@@ -182,7 +182,7 @@ function guess_signature_url() {
if url_verify "$su.$suffix" &> /dev/null; then
new_su="$su.$suffix"
new_source="$source.$suffix"
- [[ $silent != silent ]] && message "Succes!"
+ [[ $silent != silent ]] && message "Success!"
return 0
fi
done
@@ -237,7 +237,9 @@ function quill_get_spell_keyring() {
SPELL_KEYRING=$(gpg --verify $SOURCE_CACHE/${SPELL_SIGNATURE##*/} 2>&1 |
sed -n 's,^.* key ID ,,p')

# create the keyring
- gpg --no-default-keyring --keyring
$QUILL_SPELL_DIR/$SPELL_NAME/$SPELL_NAME.gpg --recv-keys $SPELL_KEYRING
+ gpg --import-options import-minimal --no-default-keyring --keyring \
+ $QUILL_SPELL_DIR/$SPELL_NAME/$SPELL_KEYRING.gpg --recv-keys
$SPELL_KEYRING
+
SPELL_KEYRING=$SPELL_NAME.gpg

if query "Is there a more complete keyring available?" y; then
diff --git a/var/lib/quill/version b/var/lib/quill/version
index d55f328..ae5393f 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.6-rc7
+0.2.6-rc8



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (256c24f57b1638a3bc013128db07005abf001561), Jaka Kranjc, 06/30/2007

Archive powered by MHonArc 2.6.24.

Top of Page