Skip to Content.
Sympa Menu

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

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 (d4a7268ecb315d348e41dc8c3433789ac92262d3)
  • Date: Tue, 25 Nov 2008 06:44:30 -0600

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

var/lib/quill/ChangeLog | 5 +++++
var/lib/quill/modules/libcompat | 2 +-
var/lib/quill/modules/libgpg | 2 +-
var/lib/quill/version | 2 +-
4 files changed, 8 insertions(+), 3 deletions(-)

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

* libcompat: fixed loose matching in the 1.13 url_ftp_verify fix
* libgpg: when testing the new verification system also source quillrc

diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index a13fd89..aec74e3 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libcompat: fixed loose matching in the 1.13 url_ftp_verify fix
+ * libgpg: when testing the new verification system also source quillrc
+ * version: 0.3.0-rc4
+
2008-08-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libdeprecation: added a note about the conflict's HISTORY
* version: 0.3.0-rc3
diff --git a/var/lib/quill/modules/libcompat b/var/lib/quill/modules/libcompat
index b8cc9f6..f9c1a62 100644
--- a/var/lib/quill/modules/libcompat
+++ b/var/lib/quill/modules/libcompat
@@ -19,7 +19,7 @@ function url_ftp_verify() {
local DIRECTORY=`dirname $URL`
local OUTPUT=`wget --passive-ftp -t 1 -T 30 -O - --spider -S
"$DIRECTORY/" 2>&1`

- if grep -q "$FILENAME" <<< "$OUTPUT"; then
+ if grep -q "$FILENAME$" <<< "$OUTPUT"; then
rm -f .listing
else
echo $OUTPUT | sed 's/LIST.*//g'
diff --git a/var/lib/quill/modules/libgpg b/var/lib/quill/modules/libgpg
index 2e461f3..890d4bf 100644
--- a/var/lib/quill/modules/libgpg
+++ b/var/lib/quill/modules/libgpg
@@ -171,7 +171,7 @@ function convert_to_upstream_gpg() {
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
+ . $QUILL_MODULES/libcopy; . $QUILL_MODULES/libupdate; . $QUILL_QUILLRC;
SPELL_NAME=$SPELL_NAME; QUILL_SPELL_DIR=$QUILL_SPELL_DIR
get_sources_and_urls
summon_sources || exit 1
diff --git a/var/lib/quill/version b/var/lib/quill/version
index 9c433fa..beb09dc 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.3.0-rc3
+0.3.0-rc4



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (d4a7268ecb315d348e41dc8c3433789ac92262d3), Jaka Kranjc, 11/25/2008

Archive powered by MHonArc 2.6.24.

Top of Page