Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test-1.15 sorcery by Jaka Kranjc (744f3575f4cabff4667f54981f58a48ebc38295c)

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.15 sorcery by Jaka Kranjc (744f3575f4cabff4667f54981f58a48ebc38295c)
  • Date: Sat, 8 Oct 2011 07:04:24 -0500

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

ChangeLog | 7 +++++++
etc/sorcery/version | 2 +-
usr/sbin/cleanse | 2 +-
usr/sbin/gaze | 2 +-
var/lib/sorcery/modules/libdownload | 2 +-
5 files changed, 11 insertions(+), 4 deletions(-)

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

1.15.1-rc1

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

libdownload: print the original argument if cmd is unset

eg. if svn is passed, cmd is empty and nothing is printed as the first
word in the sentence

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

cleanse: do not treat held and dispelled spells equally #264

fixes #264

Conflicts:

ChangeLog

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

gaze: don't break on broken or rare tablets #265, starting patch from
Pyrobor
fixes #265

diff --git a/ChangeLog b/ChangeLog
index eca586c..b7e2217 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-06 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libdownload: print the original argument if cmd is unset
+
+2011-10-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * gaze: don't break on broken or rare tablets #265
+ * cleanse: do not treat held and dispelled spells equally #264
+
2011-09-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* version: 1.15.0 released!

diff --git a/etc/sorcery/version b/etc/sorcery/version
index 141f2e8..b927744 100644
--- a/etc/sorcery/version
+++ b/etc/sorcery/version
@@ -1 +1 @@
-1.15.0
+1.15.1-rc1
diff --git a/usr/sbin/cleanse b/usr/sbin/cleanse
index 8a72830..d171875 100755
--- a/usr/sbin/cleanse
+++ b/usr/sbin/cleanse
@@ -687,7 +687,7 @@ function cleanse_fix_run_checks() {
set_term_title "Checking $SPELL ($2 of $3)"
message "Checking ${SPELL_COLOR}${SPELL}${DEFAULT_COLOR} ($2 of $3)"
fi
- if ! spell_installed $SPELL; then
+ if ! spell_ok $SPELL; then
message "${SPELL_COLOR}${SPELL}${MESSAGE_COLOR_COLOR}" \
"was dispelled in the meanwhile, skipping check!${DEFAULT_COLOR}"
return 0
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index f7e3834..1329f2b 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -1896,7 +1896,7 @@ function gaze_tablet() {
elif [[ -s $1 && $(file -b --mime-encoding $1) == binary ]]; then
message "Binary file, skipping ..."
else
- cat $1
+ PAGER=cat show_file "$1" no "$3 is missing or empty"
fi
}
function gaze_tablet_sub() {
diff --git a/var/lib/sorcery/modules/libdownload
b/var/lib/sorcery/modules/libdownload
index a548acf..2f1335f 100755
--- a/var/lib/sorcery/modules/libdownload
+++ b/var/lib/sorcery/modules/libdownload
@@ -96,7 +96,7 @@ function dl_command_check() {
local cmd
smgl_which $1 cmd
if ! [[ $cmd ]] || ! test -x $cmd ; then
- message "${PROBLEM_COLOR}$cmd is not installed, please cast it..." \
+ message "${PROBLEM_COLOR}${cmd:-$1} is not installed, please cast it..."
\
"${DEFAULT_COLOR}"
return 1
fi



  • [SM-Commit] GIT changes to test-1.15 sorcery by Jaka Kranjc (744f3575f4cabff4667f54981f58a48ebc38295c), Jaka Kranjc, 10/08/2011

Archive powered by MHonArc 2.6.24.

Top of Page