Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 76790 by Andrew Stitt for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT gmail.com>, "Arwed von Merkatz" <v.merkatz AT gmx.net>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Michael Leo Brown Jr." <dmlb2000 AT gmail.com>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Jason Flatt" <jflatt AT sourcemage.org>, "Jeremy Blosser" <jblosser AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Robin Cook" <rcook AT wyrms.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 76790 by Andrew Stitt for review
  • Date: Sat, 25 Mar 2006 23:00:02 +0000 (GMT)

Change 76790 by andrew_stitt@afk-courier on 2006/03/25 22:57:08

fix bug 10574

Affected files ...

... //sgl/sorcery/test/ChangeLog#184 integrate
... //sgl/sorcery/test/var/lib/sorcery/modules/libunpack#11 integrate

Differences ...

==== //sgl/sorcery/test/ChangeLog#184 (text) ====

@@ -1,4 +1,8 @@
2006-03-25 Andrew Stitt <astitt AT sourcemage.org>
+ * libunpack: check for spell or actual command before assuming
+ verification cannot be done.
+
+2006-03-25 Andrew Stitt <astitt AT sourcemage.org>
* libsorcery: remove LC_ALL hack
* cast: put slightly safer LC_ALL hack in cast around the build
phase. This fixes bug 10546, see also bug 2910.

==== //sgl/sorcery/test/var/lib/sorcery/modules/libunpack#11 (xtext) ====

@@ -260,9 +260,10 @@
function unpack_spell_required() {
debug "libgrimoire" "Running unpack_spell_required -- $1"

- if ! spell_ok "$1" ; then
+ local x
+ if ! spell_ok "$1" && ! smgl_which $2 x &> /dev/null; then
query "This spell has an option to check its integrity via spell "\
-"${SPELL_COLOR}${1}${QUERY_COLOR} for $2, you might consider casting it. "\
+"${SPELL_COLOR}${1}${QUERY_COLOR} with the $2 command for $3, you might
consider installing it. "\
"Abort?" n &&
return 1 ||
return 200
@@ -372,7 +373,7 @@

message "${MESSAGE_COLOR}GPG checking source file $1...${DEFAULT_COLOR}"

- unpack_spell_required gnupg || return "$?"
+ unpack_spell_required gnupg gpg || return "$?"

gpg_verify_signature "$( locate_spell_file "$SFNAME" )" \
"$FILENAME" \
@@ -428,10 +429,11 @@
if [ "$MD5SUM_DL" != "off" ]; then

if [[ "$ALGORITHM" == md5 ]] || [[ "$ALGORITHM" == sha1 ]] ; then
- unpack_spell_required coreutils "$ALGORITHM" || return "$?"
+ unpack_spell_required coreutils "${ALGORITHM}sum" "$ALGORITHM" ||
+ return "$?"
HASH="$(${ALGORITHM}sum "$FILENAME" | cut -d' ' -f1)"
else
- unpack_spell_required gnupg "$ALGORITHM" || return "$?"
+ unpack_spell_required gnupg gpg "$ALGORITHM" || return "$?"
if list_find "$(gpg_get_hashes)" $ALGORITHM; then
HASH="$(gpg_hashsum "${ALGORITHM}" "$FILENAME" | cut -d' ' -f1)"
else



  • [SM-Commit] PERFORCE change 76790 by Andrew Stitt for review, Perforce Review Daemon, 03/25/2006

Archive powered by MHonArc 2.6.24.

Top of Page