Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (7001dc69adf12537976632c446eb7bce7133f884)

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 sorcery by Jaka Kranjc (7001dc69adf12537976632c446eb7bce7133f884)
  • Date: Wed, 6 Feb 2008 11:14:12 -0600

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

ChangeLog | 4 ++++
var/lib/sorcery/modules/libunpack | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)

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

better unpack_hash error message
one for the grimoire team :)

diff --git a/ChangeLog b/ChangeLog
index 41e8ffc..0859541 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libunpack: improved the error message in unpack_hash with info
which hash
+ is which
+
2008-02-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* cast: made the confmeld message more explicit
* libstage: added a staged config removal routine, mostly for
leftover dirs
diff --git a/var/lib/sorcery/modules/libunpack
b/var/lib/sorcery/modules/libunpack
index 2a492c5..dd11660 100755
--- a/var/lib/sorcery/modules/libunpack
+++ b/var/lib/sorcery/modules/libunpack
@@ -471,8 +471,8 @@ function unpack_hash() {

if [[ "$HASH" != "$HASHSUM" ]] || [[ $rc != 0 ]]
then
- message "${PROBLEM_COLOR}$ALGORITHM check failed" \
- "$HASH != $HASHSUM !${DEFAULT_COLOR}" &&
+ error_message "${PROBLEM_COLOR}$ALGORITHM check failed!" &&
+ error_message "$HASH (computed) != $HASHSUM (expected)!$DEFAULT_COLOR"
&&
hash_user_query 1 "$SPELL" spell || return 1
else
is_allowed_hash "$ALGORITHM" "$HLEVEL"



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (7001dc69adf12537976632c446eb7bce7133f884), Jaka Kranjc, 02/06/2008

Archive powered by MHonArc 2.6.24.

Top of Page