Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.13 sorcery by Jaka Kranjc (585b8d2e933fb28a7f4b726e6c1d541223fd094e)

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 test-1.13 sorcery by Jaka Kranjc (585b8d2e933fb28a7f4b726e6c1d541223fd094e)
  • Date: Fri, 14 Mar 2008 14:33:18 -0500

GIT changes to test-1.13 sorcery by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

ChangeLog | 22 ++++++++++++++++++++++
etc/sorcery/compile_config | 3 ++-
etc/sorcery/url | 6 +++---
etc/sorcery/version | 2 +-
usr/sbin/cleanse | 12 ++++++++++--
usr/sbin/gaze | 14 +++++++++-----
usr/sbin/scribbler | 2 +-
var/lib/sorcery/modules/libmisc | 3 ++-
var/lib/sorcery/modules/libunpack | 4 ++--
9 files changed, 52 insertions(+), 16 deletions(-)

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

1.13.8-rc7

commit e91fb1418289d3b59c7de1791d4046c2078f3a6a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

scribbler: fixed message when scribbling from a missing grimoire #14353

(cherry-picked from commit cff58884a99fd181f0febf999006b58bd1404ab2)

commit 1adf833c40d8c7282374d9cf9bb80164e0c3d766
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

cleanse: don't display cast/dispel commands if none are needed and print a
newline between each menu

(cherry-picked from commit 9b27af65a1ec97aec25272e963d07baa9aa3c760)

commit b6fadeb9ebb34225dcf811112a2b36ac5dc91ba3
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

gaze: small grammar fix in gaze_show_spells_by_status

(cherry-picked from commit 4fde83105faf165b6224c463e4e40ca0e88c3ab6)

commit 81704f73e23cdc6b943f1cc401f1d95d07d3775a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libmisc: fixed consolidate_params so it can take "-[eEn]" as values too;
before they were passed to echo and ignored, breaking dispel -e
and possibly alter

(cherry-picked from commit b551c92bc2349921e4e3b7888db4b61d744e1980)

commit 3c174d5e3241d4aa05aff06657277a9bd94868c5
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

gaze: don't falsely return 1 in gaze version

(cherry-picked from commit c817ee0d4e06bc406d6eb71319e54f931930af0e)

commit a33a6a946f2acd26616e67626d1c2046cc6488b0
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

url, compile_config: better conditional sourcing #14304

(cherry-picked from commit 2d169b9f825ba722ee4b594cc7052e7c43e599bd)

commit 04041d1f188c3d8e89c749a8149c9d6e1952c295
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

better unpack_hash error message
one for the grimoire team :)

(cherry-picked from commit 7001dc69adf12537976632c446eb7bce7133f884)

diff --git a/ChangeLog b/ChangeLog
index 04b93b8..46273e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2008-03-07 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * scribbler: fixed message when scribbling from a missing grimoire
#14353
+
+2008-03-03 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ don't display cast/dispel commands if none are needed and print a
+ newline between each menu
+
+2008-02-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libmisc: fixed consolidate_params so it can take "-[eEn]" as values
too;
+ before they were passed to echo and ignored, breaking dispel -e
+ * gaze: small grammar fix in gaze_show_spells_by_status
+
+2008-02-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * gaze: don't falsely return 1 in gaze version
+
+2008-02-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * url, compile_config: better conditional sourcing #14304
+
+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-04 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* *: comment fixes for bashdoc - modified patch from Arvid Norlander

diff --git a/etc/sorcery/compile_config b/etc/sorcery/compile_config
index d9b5785..5e1fcc5 100644
--- a/etc/sorcery/compile_config
+++ b/etc/sorcery/compile_config
@@ -7,5 +7,6 @@
MAKE_NJOBS=${MAKE_NJOBS:-1}
RUN_COMPILER_DIR=/var/lib/sorcery/build

-[ -x $LOCAL_COMPILE_CONFIG ] &&
+if [[ -e $LOCAL_COMPILE_CONFIG ]]; then
. $LOCAL_COMPILE_CONFIG
+fi
diff --git a/etc/sorcery/url b/etc/sorcery/url
index 2e13024..1121fb7 100755
--- a/etc/sorcery/url
+++ b/etc/sorcery/url
@@ -34,7 +34,7 @@ FALLBACK_URL_MIRROR[3]=http://shlrm.org/sourcemage
# reverse the comments below to use rsync by default
CODEX_URL=${CODEX_URL:=$CODEX_TARBALL_URL}
#CODEX_URL=${CODEX_URL:=$CODEX_RSYNC_URL}
-

-
-test -e $LOCAL_URL_CONFIG && . $LOCAL_URL_CONFIG
+if [[ -e $LOCAL_URL_CONFIG ]]; then
+ . $LOCAL_URL_CONFIG
+fi
diff --git a/etc/sorcery/version b/etc/sorcery/version
index 5de39d0..22e6a44 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.13.8-rc6
+1.13.8-rc7
diff --git a/usr/sbin/cleanse b/usr/sbin/cleanse
index bb012ea..0f6cc5f 100755
--- a/usr/sbin/cleanse
+++ b/usr/sbin/cleanse
@@ -374,6 +374,7 @@ function prune_depends()
exit 1
;;
esac
+ echo
shift 4
done

@@ -386,9 +387,16 @@ function prune_depends()
[ -s $TMP_DIR/prune.cast ] &&
cast -c $( sort $TMP_DIR/prune.cast | uniq )
else
+ local prune_dispel prune_cast t
+ prune_dispel=$(sort -u $TMP_DIR/prune.dispel 2>/dev/null)
+ prune_cast=$(sort -u $TMP_DIR/prune.cast 2>/dev/null)
+ if [[ -z $prune_dispel$prune_cast ]]; then
+ message "Pruning done."
+ return 0
+ fi
t=$(date +%Y%m%d%s)
- echo dispel $( sort $TMP_DIR/prune.dispel 2>/dev/null | uniq ) >
$BACKUPDIR/prune.$t
- echo cast -c $( sort $TMP_DIR/prune.cast 2>/dev/null | uniq ) >>
$BACKUPDIR/prune.$t
+ echo dispel $prune_dispel > $BACKUPDIR/prune.$t
+ echo cast -c $prune_cast >> $BACKUPDIR/prune.$t
cat $BACKUPDIR/prune.$t
message "For future reference, lines are stored in $BACKUPDIR/prune.$t"
fi
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index a25d612..aecc6c4 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -1092,10 +1092,14 @@ function gaze_show_version() {
echo " "


- [ -n "$UNKNOWN" ] &&
- message "Unknown Spells or Sections" &&
- message "--------------------------" &&
- message "$UNKNOWN"
+ if [[ -n $UNKNOWN ]]; then
+ message "Unknown Spells or Sections"
+ message "--------------------------"
+ message "$UNKNOWN"
+ return 1
+ else
+ return 0
+ fi

}

@@ -1645,7 +1649,7 @@ function gaze_install() {
#---------------------------------------------------------------------
function gaze_show_spells_by_status () {
message -n "${MESSAGE_COLOR}The following spells are set to"
- message -n "${DEFAULT_COLOR} $2"
+ message -n "${DEFAULT_COLOR} $2:"
message "${SPELL_COLOR}"
get_all_spells_with_status $1 | sort | maybe_column
message -n "${DEFAULT_COLOR}"
diff --git a/usr/sbin/scribbler b/usr/sbin/scribbler
index a94540f..d103c8c 100755
--- a/usr/sbin/scribbler
+++ b/usr/sbin/scribbler
@@ -135,7 +135,7 @@ function validate_and_parse_args() {
## Set and validate the from-grimoire name
if ! FROM_GRIMOIRE_DIRECTORY=$(codex_find_grimoire $3) ; then
message "${PROBLEM_COLOR}The grimoire you specified" \
- "(${SPELL_COLOR}${2}${PROBLEM_COLOR}) can not be" \
+ "(${SPELL_COLOR}${3}${PROBLEM_COLOR}) can not be" \
"found.${DEFAULT_COLOR}"
exit 1
fi
diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index da74647..7df481c 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -394,7 +394,8 @@ function esc_str()
function consolidate_params() {
local param
for param in "$@"; do
- echo -n $param | sed 's/ /\\ /g'
+ # add and remove a dummy space, so echo parameters can be used as values
+ echo -n "" $param | sed 's/ //; s/ /\\ /g'
echo -n " "
done
}
diff --git a/var/lib/sorcery/modules/libunpack
b/var/lib/sorcery/modules/libunpack
index 0aa8584..69b9b53 100755
--- a/var/lib/sorcery/modules/libunpack
+++ b/var/lib/sorcery/modules/libunpack
@@ -464,8 +464,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
if is_allowed_hash ${ALGORITHM} ${HLEVEL} ; then rc=0 ; else rc=1 ; fi



  • [SM-Commit] GIT changes to test-1.13 sorcery by Jaka Kranjc (585b8d2e933fb28a7f4b726e6c1d541223fd094e), Jaka Kranjc, 03/14/2008

Archive powered by MHonArc 2.6.24.

Top of Page